Build fix for previous c16 change

base/strings/string16.h

Index: base/strings/string16.h
diff --git a/base/strings/string16.h b/base/strings/string16.h
index c912785ebc6d0d9d37b03748d6c60d397f8cde95..a2bd527008f4047ebc70910e167b3ba57bca276c 100644
--- a/base/strings/string16.h
+++ b/base/strings/string16.h
@@ -28,6 +28,25 @@ namespace base {
 
 typedef uint16_t char16;
 
+}  // namespace base
+
+#endif  // WCHAR_T_IS_UTF32
+
+namespace base {

[Mark Mentovai, 2014/12/16 02:18:29]

This is all getting a bit sloppy. How about making it so that we start with
common stuff, then we have an #ifdef section that defines things that are common
to both #ifdefs but with different implementations. At the end, we can stick
stuff specific to one #ifdef or another.

Like:

namespace base {

int c16memcmp(…);
// other declarations

#if defined(WCHAR_T_IS_UTF16)

typedef wchar_t char16;
// other typedefs

#elif defined(WCHAR_T_IS_UTF32)

typedef uint16_t char16;

struct string16_char_traits {
  // blah blah blah
};

typedef … string16;

#endif

}  // namespace base

#if defined(WCHAR_T_IS_UTF32)

// things specific to WCHAR_T_IS_UTF32 go here
// like operator<< and and extern template class

#endif

[scottmg, 2014/12/16 17:32:23]

Yeah, it's a bit messy. The common can't go at the top because it requires the
typedef for char16, but I think https://codereview.chromium.org/812553004 mostly
follows your suggestion in reducing the number of namespace open/closes.

+
+int c16memcmp(const char16* s1, const char16* s2, size_t n);
+size_t c16len(const char16* s);
+const char16* c16memchr(const char16* s, char16 c, size_t n);
+char16* c16memmove(char16* s1, const char16* s2, size_t n);
+char16* c16memcpy(char16* s1, const char16* s2, size_t n);
+char16* c16memset(char16* s, char16 c, size_t n);
+
+}  // namespace base
+
+#if defined(WCHAR_T_IS_UTF32)
+
+namespace base {
+
 struct string16_char_traits {
   typedef char16 char_type;
   typedef int int_type;
@@ -106,15 +125,4 @@ extern template class std::basic_string<base::char16,
 
 #endif  // WCHAR_T_IS_UTF32
 
-namespace base {
-
-int c16memcmp(const char16* s1, const char16* s2, size_t n);
-size_t c16len(const char16* s);
-const char16* c16memchr(const char16* s, char16 c, size_t n);
-char16* c16memmove(char16* s1, const char16* s2, size_t n);
-char16* c16memcpy(char16* s1, const char16* s2, size_t n);
-char16* c16memset(char16* s, char16 c, size_t n);
-
-}  // namespace base
-
 #endif  // MINI_CHROMIUM_BASE_STRINGS_STRING16_H_