diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-05-06 14:05:41 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-05-06 14:05:41 +0200 |
| commit | d8617dcd8dc79e135be0cc9cc534a43d5b328c0e (patch) | |
| tree | 1ac14bcb49ec34734c90d0c9c719169331b3c68a /cpp/src/Ice/LoggerI.cpp | |
| parent | ICE-6483 upgrade to gradle 2.4 (diff) | |
| download | ice-d8617dcd8dc79e135be0cc9cc534a43d5b328c0e.tar.bz2 ice-d8617dcd8dc79e135be0cc9cc534a43d5b328c0e.tar.xz ice-d8617dcd8dc79e135be0cc9cc534a43d5b328c0e.zip | |
Fixed ICE-6482: Cleanup WinRT makefiles, other WinRT minor fixes
Diffstat (limited to 'cpp/src/Ice/LoggerI.cpp')
| -rw-r--r-- | cpp/src/Ice/LoggerI.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cpp/src/Ice/LoggerI.cpp b/cpp/src/Ice/LoggerI.cpp index f3e87785a59..26868805206 100644 --- a/cpp/src/Ice/LoggerI.cpp +++ b/cpp/src/Ice/LoggerI.cpp @@ -18,6 +18,7 @@ #endif #include <Ice/LocalException.h> +#include <Ice/BasicStream.h> using namespace std; using namespace Ice; @@ -48,7 +49,7 @@ Init init; } -Ice::LoggerI::LoggerI(const string& prefix, const string& file, +Ice::LoggerI::LoggerI(const string& prefix, const string& file, bool convert, const IceUtil::StringConverterPtr& converter) : _prefix(prefix), _convert(convert), @@ -153,7 +154,7 @@ Ice::LoggerI::write(const string& message, bool indent) #elif defined(_WIN32) // // Convert the message from the native narrow string encoding to the console - // code page encoding for printing. If the _convert member is set to false + // code page encoding for printing. If the _convert member is set to false // we don't do any conversion. // if(!_convert) @@ -172,11 +173,11 @@ Ice::LoggerI::write(const string& message, bool indent) { // Convert message to UTF-8 string u8s = IceUtil::nativeToUTF8(s, _converter); - + // Then from UTF-8 to console CP string consoleString; _consoleConverter->fromUTF8(reinterpret_cast<const Byte*>(u8s.data()), - reinterpret_cast<const Byte*>(u8s.data() + u8s.size()), + reinterpret_cast<const Byte*>(u8s.data() + u8s.size()), consoleString); // We cannot use cerr here as writing to console using cerr |