summaryrefslogtreecommitdiffstats
path: root/base/string16.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-28 19:51:28 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-28 19:51:28 +0000
commita9e2d95a698ec0ad18b3d3a7614018d193ad3916 (patch)
tree16b7fa0b65f3c4f484d59d7a5c8b38d0383a4564 /base/string16.cc
parentf09d4d3c4958e4a742acd8ffb52d4d662f43b8c8 (diff)
downloadchromium_src-a9e2d95a698ec0ad18b3d3a7614018d193ad3916.zip
chromium_src-a9e2d95a698ec0ad18b3d3a7614018d193ad3916.tar.gz
chromium_src-a9e2d95a698ec0ad18b3d3a7614018d193ad3916.tar.bz2
Move string16 into the base namespace.
This is for consistency. We want everything in base to be in "base::" BUG= Review URL: https://codereview.chromium.org/13004018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191198 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/string16.cc')
-rw-r--r--base/string16.cc10
1 files changed, 4 insertions, 6 deletions
diff --git a/base/string16.cc b/base/string16.cc
index 930e09f..54d00fb 100644
--- a/base/string16.cc
+++ b/base/string16.cc
@@ -67,11 +67,6 @@ char16* c16memset(char16* s, char16 c, size_t n) {
return s_orig;
}
-} // namespace base
-
-template class std::basic_string<char16, base::string16_char_traits>;
-
-namespace base {
std::ostream& operator<<(std::ostream& out, const string16& str) {
return out << UTF16ToUTF8(str);
}
@@ -79,6 +74,9 @@ std::ostream& operator<<(std::ostream& out, const string16& str) {
void PrintTo(const string16& str, std::ostream* out) {
*out << str;
}
-}
+
+} // namespace base
+
+template class std::basic_string<char16, base::string16_char_traits>;
#endif // WCHAR_T_IS_UTF32