diff options
| author | Joe George <joe@zeroc.com> | 2016-08-30 10:16:34 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2016-08-30 10:18:40 -0400 |
| commit | ea44c6ef8c5fea32be8a110a96cf47fe684f41e7 (patch) | |
| tree | 29dd1ba76148086a4baedb94cd68c0cd79e7c51a /cpp/src | |
| parent | Added CHANGELOG entry for dispatch interceptor change (diff) | |
| parent | ICE-7302 - Fix Java Ice/exceptions not using AMDThrowerI (diff) | |
| download | ice-ea44c6ef8c5fea32be8a110a96cf47fe684f41e7.tar.bz2 ice-ea44c6ef8c5fea32be8a110a96cf47fe684f41e7.tar.xz ice-ea44c6ef8c5fea32be8a110a96cf47fe684f41e7.zip | |
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/LoggerI.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Ice/LoggerI.cpp b/cpp/src/Ice/LoggerI.cpp index 0b135e08987..ea99e3a8505 100644 --- a/cpp/src/Ice/LoggerI.cpp +++ b/cpp/src/Ice/LoggerI.cpp @@ -56,10 +56,10 @@ Ice::LoggerI::LoggerI(const string& prefix, const string& file, _prefix(prefix), _convert(convert), _converter(getProcessStringConverter()), + _sizeMax(sizeMax) #if defined(_WIN32) && !defined(ICE_OS_WINRT) - _consoleConverter(createWindowsStringConverter(GetConsoleOutputCP())), + ,_consoleConverter(createWindowsStringConverter(GetConsoleOutputCP())), #endif - _sizeMax(sizeMax) { if(!prefix.empty()) { |