diff options
author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-10 21:08:39 +0000 |
---|---|---|
committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-10 21:08:39 +0000 |
commit | 8a16266e66a38bc1bfc6b00893c2a7c8cf8c55ee (patch) | |
tree | 5c07a9d5091a56c6d5a1a2b98ec10d19ae3c20e9 /base/string_util.cc | |
parent | f8dce00e633d5ffde45e008fb8f51d5a76942f6b (diff) | |
download | chromium_src-8a16266e66a38bc1bfc6b00893c2a7c8cf8c55ee.zip chromium_src-8a16266e66a38bc1bfc6b00893c2a7c8cf8c55ee.tar.gz chromium_src-8a16266e66a38bc1bfc6b00893c2a7c8cf8c55ee.tar.bz2 |
Move StringPiece into the base namespace. It is colliding
with the StringPiece class in icu4.2, which is a problem
when trying to use the system version of icu.
Review URL: http://codereview.chromium.org/193072
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25920 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/string_util.cc')
-rw-r--r-- | base/string_util.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/base/string_util.cc b/base/string_util.cc index 82b6c0b..fd33ef0 100644 --- a/base/string_util.cc +++ b/base/string_util.cc @@ -506,7 +506,7 @@ std::string WideToASCII(const std::wstring& wide) { return std::string(wide.begin(), wide.end()); } -std::wstring ASCIIToWide(const StringPiece& ascii) { +std::wstring ASCIIToWide(const base::StringPiece& ascii) { DCHECK(IsStringASCII(ascii)) << ascii; return std::wstring(ascii.begin(), ascii.end()); } @@ -516,7 +516,7 @@ std::string UTF16ToASCII(const string16& utf16) { return std::string(utf16.begin(), utf16.end()); } -string16 ASCIIToUTF16(const StringPiece& ascii) { +string16 ASCIIToUTF16(const base::StringPiece& ascii) { DCHECK(IsStringASCII(ascii)) << ascii; return string16(ascii.begin(), ascii.end()); } @@ -563,7 +563,7 @@ bool IsStringASCII(const string16& str) { } #endif -bool IsStringASCII(const StringPiece& str) { +bool IsStringASCII(const base::StringPiece& str) { return DoIsStringASCII(str); } @@ -745,7 +745,7 @@ bool LowerCaseEqualsASCII(const wchar_t* a_begin, return DoLowerCaseEqualsASCII(a_begin, a_end, b); } -bool EqualsASCII(const string16& a, const StringPiece& b) { +bool EqualsASCII(const string16& a, const base::StringPiece& b) { if (a.length() != b.length()) return false; return std::equal(b.begin(), b.end(), a.begin()); |