diff options
author | mmentovai@google.com <mmentovai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-27 20:57:35 +0000 |
---|---|---|
committer | mmentovai@google.com <mmentovai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-27 20:57:35 +0000 |
commit | d13701900a71240fe1b4074b778133ba9a3461e9 (patch) | |
tree | 3ca3fd78ec07a47dcc2cad83defb977b0ad61e81 /base/string_util.h | |
parent | b8c87bb8ea9f514a8f09a0f2154f8469ba7faf00 (diff) | |
download | chromium_src-d13701900a71240fe1b4074b778133ba9a3461e9.zip chromium_src-d13701900a71240fe1b4074b778133ba9a3461e9.tar.gz chromium_src-d13701900a71240fe1b4074b778133ba9a3461e9.tar.bz2 |
Move std::string16 to base::string16. Don't pollute the std namespace. Don't
assume that all string types can be represented as std::basic_string<CHAR>.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1464 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/string_util.h')
-rw-r--r-- | base/string_util.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/base/string_util.h b/base/string_util.h index bd95589..69ac608 100644 --- a/base/string_util.h +++ b/base/string_util.h @@ -175,15 +175,15 @@ std::string WideToUTF8(const std::wstring& wide); bool UTF8ToWide(const char* src, size_t src_len, std::wstring* output); std::wstring UTF8ToWide(const std::string& utf8); -bool WideToUTF16(const wchar_t* src, size_t src_len, std::string16* output); -std::string16 WideToUTF16(const std::wstring& wide); +bool WideToUTF16(const wchar_t* src, size_t src_len, string16* output); +string16 WideToUTF16(const std::wstring& wide); bool UTF16ToWide(const char16* src, size_t src_len, std::wstring* output); -std::wstring UTF16ToWide(const std::string16& utf8); +std::wstring UTF16ToWide(const string16& utf8); -bool UTF8ToUTF16(const char* src, size_t src_len, std::string16* output); -std::string16 UTF8ToUTF16(const std::string& utf8); +bool UTF8ToUTF16(const char* src, size_t src_len, string16* output); +string16 UTF8ToUTF16(const std::string& utf8); bool UTF16ToUTF8(const char16* src, size_t src_len, std::string* output); -std::string UTF16ToUTF8(const std::string16& utf16); +std::string UTF16ToUTF8(const string16& utf16); // Defines the error handling modes of WideToCodepage and CodepageToWide. class OnStringUtilConversionError { |