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_icu.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_icu.cc')
| -rw-r--r-- | base/string_util_icu.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/base/string_util_icu.cc b/base/string_util_icu.cc index a043e97..d3c9edf 100644 --- a/base/string_util_icu.cc +++ b/base/string_util_icu.cc @@ -333,7 +333,7 @@ bool WideToUTF8(const wchar_t* src, size_t src_len, std::string* output) { return ConvertUnicode<wchar_t, std::string>(src, src_len, output); } -std::wstring UTF8ToWide(const StringPiece& utf8) { +std::wstring UTF8ToWide(const base::StringPiece& utf8) { std::wstring ret; if (utf8.empty()) return ret; |