diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-07 02:10:20 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-07 02:10:20 +0000 |
commit | 047a03f4cefa75a67070f08b3f6b727f7ea702d5 (patch) | |
tree | d00ccbd9e59106de8fd904b06720be59219d61fe /base/logging.cc | |
parent | 0511c153260e5d402d7552ff7b47a2acb17bdf2b (diff) | |
download | chromium_src-047a03f4cefa75a67070f08b3f6b727f7ea702d5.zip chromium_src-047a03f4cefa75a67070f08b3f6b727f7ea702d5.tar.gz chromium_src-047a03f4cefa75a67070f08b3f6b727f7ea702d5.tar.bz2 |
Copy the relevant parts of ICU to a new file base/third_party/icu/icu_utf.*
so we can do basic UTF8/16/32 conversions without linking all of ICU.
Change callers who used to call SysUTF8ToWide/SysWideToUTF8 in base to using
these new functions. I will remove the Sys versions of these functions in a
later patch.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/243102
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28219 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/logging.cc')
-rw-r--r-- | base/logging.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/base/logging.cc b/base/logging.cc index d35cfdb..7981310 100644 --- a/base/logging.cc +++ b/base/logging.cc @@ -39,7 +39,7 @@ typedef pthread_mutex_t* MutexHandle; #include "base/lock_impl.h" #include "base/string_piece.h" #include "base/string_util.h" -#include "base/sys_string_conversions.h" +#include "base/utf_string_conversions.h" namespace logging { @@ -328,7 +328,7 @@ void DisplayDebugMessage(const std::string& str) { backslash[1] = 0; wcscat_s(prog_name, MAX_PATH, L"debug_message.exe"); - std::wstring cmdline = base::SysUTF8ToWide(str); + std::wstring cmdline = UTF8ToWide(str); if (cmdline.empty()) return; @@ -578,5 +578,5 @@ void CloseLogFile() { } // namespace logging std::ostream& operator<<(std::ostream& out, const wchar_t* wstr) { - return out << base::SysWideToUTF8(std::wstring(wstr)); + return out << WideToUTF8(std::wstring(wstr)); } |