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.h | |
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.h')
-rw-r--r-- | base/string_util.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/base/string_util.h b/base/string_util.h index d1767f9..9143346 100644 --- a/base/string_util.h +++ b/base/string_util.h @@ -176,9 +176,9 @@ std::string CollapseWhitespaceASCII(const std::string& text, // These convert between ASCII (7-bit) and Wide/UTF16 strings. std::string WideToASCII(const std::wstring& wide); -std::wstring ASCIIToWide(const StringPiece& ascii); +std::wstring ASCIIToWide(const base::StringPiece& ascii); std::string UTF16ToASCII(const string16& utf16); -string16 ASCIIToUTF16(const StringPiece& ascii); +string16 ASCIIToUTF16(const base::StringPiece& ascii); // These convert between UTF-8, -16, and -32 strings. They are potentially slow, // so avoid unnecessary conversions. The low-level versions return a boolean @@ -196,7 +196,7 @@ string16 ASCIIToUTF16(const StringPiece& ascii); bool WideToUTF8(const wchar_t* src, size_t src_len, std::string* output); std::string WideToUTF8(const std::wstring& wide); bool UTF8ToWide(const char* src, size_t src_len, std::wstring* output); -std::wstring UTF8ToWide(const StringPiece& utf8); +std::wstring UTF8ToWide(const base::StringPiece& utf8); bool WideToUTF16(const wchar_t* src, size_t src_len, string16* output); string16 WideToUTF16(const std::wstring& wide); @@ -287,7 +287,7 @@ bool IsString8Bit(const std::wstring& str); bool IsStringUTF8(const std::string& str); bool IsStringWideUTF8(const std::wstring& str); bool IsStringASCII(const std::wstring& str); -bool IsStringASCII(const StringPiece& str); +bool IsStringASCII(const base::StringPiece& str); bool IsStringASCII(const string16& str); // ASCII-specific tolower. The standard library's tolower is locale sensitive, @@ -353,7 +353,7 @@ bool LowerCaseEqualsASCII(const wchar_t* a_begin, // Performs a case-sensitive string compare. The behavior is undefined if both // strings are not ASCII. -bool EqualsASCII(const string16& a, const StringPiece& b); +bool EqualsASCII(const string16& a, const base::StringPiece& b); // Returns true if str starts with search, or false otherwise. bool StartsWithASCII(const std::string& str, |