diff options
| author | Bernard Normier <bernard@zeroc.com> | 2014-05-16 12:30:43 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2014-05-16 12:30:43 -0400 |
| commit | 3f3450439b7558443a58279980aadaf069f5a086 (patch) | |
| tree | e3d5a066653b410e668b0f71f5cfde42e07177c4 /cpp/src/Ice/LoggerI.cpp | |
| parent | Fixed build (diff) | |
| download | ice-3f3450439b7558443a58279980aadaf069f5a086.tar.bz2 ice-3f3450439b7558443a58279980aadaf069f5a086.tar.xz ice-3f3450439b7558443a58279980aadaf069f5a086.zip | |
Updated nativeToUTF8 and UTF8ToNative for consistency with stringToWstring/wstringToString
Diffstat (limited to 'cpp/src/Ice/LoggerI.cpp')
| -rw-r--r-- | cpp/src/Ice/LoggerI.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Ice/LoggerI.cpp b/cpp/src/Ice/LoggerI.cpp index f0215401657..430d9fd49f6 100644 --- a/cpp/src/Ice/LoggerI.cpp +++ b/cpp/src/Ice/LoggerI.cpp @@ -154,9 +154,9 @@ Ice::LoggerI::write(const string& message, bool indent) // // Use fprintf_s to avoid encoding conversion when stderr is connected // to Windows console. When _convert is set to false we always output - // UTF8 encoded messages. + // UTF-8 encoded messages. // - fprintf_s(stderr, "%s\n", IceUtil::nativeToUTF8(_converter, s).c_str()); + fprintf_s(stderr, "%s\n", IceUtil::nativeToUTF8(s, _converter).c_str()); fflush(stderr); } else @@ -164,7 +164,7 @@ Ice::LoggerI::write(const string& message, bool indent) try { // Convert message to UTF-8 - string u8s = IceUtil::nativeToUTF8(_converter, s); + string u8s = IceUtil::nativeToUTF8(s, _converter); // Then from UTF-8 to console CP string consoleString; |