From d4ed7973f1824478477be29989fc125b04207494 Mon Sep 17 00:00:00 2001
From: Jose <jose@zeroc.com>
Date: Mon, 9 Jan 2017 17:01:31 +0100
Subject: Fixed (ICE-6694) - Unicode output in command line tools

---
 cpp/src/Slice/Preprocessor.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'cpp/src/Slice/Preprocessor.cpp')

diff --git a/cpp/src/Slice/Preprocessor.cpp b/cpp/src/Slice/Preprocessor.cpp
index 2e0192edab9..03815d4b4d6 100644
--- a/cpp/src/Slice/Preprocessor.cpp
+++ b/cpp/src/Slice/Preprocessor.cpp
@@ -13,6 +13,7 @@
 #include <IceUtil/StringConverter.h>
 #include <IceUtil/FileUtil.h>
 #include <IceUtil/UUID.h>
+#include <IceUtil/ConsoleUtil.h>
 #include <algorithm>
 #include <iterator>
 #include <vector>
@@ -27,6 +28,7 @@
 
 using namespace std;
 using namespace Slice;
+using namespace IceUtilInternal;
 
 //
 // mcpp defines
@@ -274,10 +276,7 @@ Slice::Preprocessor::preprocess(bool keepComments, const vector<string>& extraAr
         }
         else
         {
-            ostream& os = getErrorStream();
-            os << _path << ": error: could not open temporary file: ";
-            os << _cppFile;
-            os << endl;
+            consoleErr << _path << ": error: could not open temporary file: " << _cppFile << endl;
         }
     }
 
@@ -764,14 +763,14 @@ Slice::Preprocessor::checkInputFile()
     }
     if(suffix != ".ice")
     {
-        getErrorStream() << _path << ": error: input files must end with `.ice'" << endl;
+        consoleErr << _path << ": error: input files must end with `.ice'" << endl;
         return false;
     }
 
     ifstream test(IceUtilInternal::streamFilename(_fileName).c_str());
     if(!test)
     {
-        getErrorStream() << _path << ": error: cannot open `" << _fileName << "' for reading" << endl;
+        consoleErr << _path << ": error: cannot open `" << _fileName << "' for reading" << endl;
         return false;
     }
     test.close();
-- 
cgit v1.2.3