Fixed (ICE-6694) - Unicode output in command line tools

1 files changed, 18 insertions, 17 deletions

diff --git a/cpp/src/slice2confluence/Main.cpp b/cpp/src/slice2confluence/Main.cpp
index ad6b22c9307..38a38ff8d87 100644
--- a/cpp/src/slice2confluence/Main.cpp
+++ b/cpp/src/slice2confluence/Main.cpp
@@ -11,6 +11,7 @@
 #include <IceUtil/CtrlCHandler.h>
 #include <IceUtil/Mutex.h>
 #include <IceUtil/MutexPtrLock.h>
+#include <IceUtil/ConsoleUtil.h>
 #include <Slice/Preprocessor.h>
 #include <Slice/FileTracker.h>
 #include <Slice/Util.h>
@@ -19,7 +20,7 @@
 
 using namespace std;
 using namespace Slice;
-using namespace IceUtil;
+using namespace IceUtilInternal;
 
 namespace
 {
@@ -80,8 +81,8 @@ interruptedCallback(int signal)
 void
 usage(const string& n)
 {
-    getErrorStream() << "Usage: " << n << " [options] slice-files...\n";
-    getErrorStream() <<
+    consoleErr << "Usage: " << n << " [options] slice-files...\n";
+    consoleErr <<
         "Options:\n"
         "-h, --help           Show this message.\n"
         "-v, --version        Display the Ice version.\n"
@@ -144,7 +145,7 @@ compile(const vector<string>& argv)
     }
     catch(const IceUtilInternal::BadOptException& e)
     {
-        getErrorStream() << argv[0] << ": error: " << e.reason << endl;
+        consoleErr << argv[0] << ": error: " << e.reason << endl;
         if(!validate)
         {
             usage(argv[0]);
@@ -160,7 +161,7 @@ compile(const vector<string>& argv)
 
     if(opts.isSet("version"))
     {
-        getErrorStream() << ICE_STRING_VERSION << endl;
+        consoleErr << ICE_STRING_VERSION << endl;
         return EXIT_SUCCESS;
     }
 
@@ -207,8 +208,8 @@ compile(const vector<string>& argv)
         s >>  indexCount;
         if(!s)
         {
-            getErrorStream() << argv[0] << ": error: the --index operation requires a positive integer argument"
-                             << endl;
+            consoleErr << argv[0] << ": error: the --index operation requires a positive integer argument"
+                       << endl;
             if(!validate)
             {
                 usage(argv[0]);
@@ -231,8 +232,8 @@ compile(const vector<string>& argv)
         s >>  summaryCount;
         if(!s)
         {
-            getErrorStream() << argv[0] << ": error: the --summary operation requires a positive integer argument"
-                             << endl;
+            consoleErr << argv[0] << ": error: the --summary operation requires a positive integer argument"
+                       << endl;
             if(!validate)
             {
                 usage(argv[0]);
@@ -249,7 +250,7 @@ compile(const vector<string>& argv)
 
     if(args.empty())
     {
-        getErrorStream() << argv[0] << ": error: no input file" << endl;
+        consoleErr << argv[0] << ": error: no input file" << endl;
         if(!validate)
         {
             usage(argv[0]);
@@ -325,19 +326,19 @@ compile(const vector<string>& argv)
             // created files.
             FileTracker::instance()->cleanup();
             p->destroy();
-            getErrorStream() << argv[0] << ": error: " << ex.reason() << endl;
+            consoleErr << argv[0] << ": error: " << ex.reason() << endl;
             return EXIT_FAILURE;
         }
         catch(const string& err)
         {
             FileTracker::instance()->cleanup();
-            getErrorStream() << argv[0] << ": error: " << err << endl;
+            consoleErr << argv[0] << ": error: " << err << endl;
             status = EXIT_FAILURE;
         }
         catch(const char* err)
         {
             FileTracker::instance()->cleanup();
-            getErrorStream() << argv[0] << ": error: " << err << endl;
+            consoleErr << argv[0] << ": error: " << err << endl;
             status = EXIT_FAILURE;
         }
     }
@@ -370,22 +371,22 @@ int main(int argc, char* argv[])
     }
     catch(const std::exception& ex)
     {
-        getErrorStream() << args[0] << ": error:" << ex.what() << endl;
+        consoleErr << args[0] << ": error:" << ex.what() << endl;
         return EXIT_FAILURE;
     }
     catch(const std::string& msg)
     {
-        getErrorStream() << args[0] << ": error:" << msg << endl;
+        consoleErr << args[0] << ": error:" << msg << endl;
         return EXIT_FAILURE;
     }
     catch(const char* msg)
     {
-        getErrorStream() << args[0] << ": error:" << msg << endl;
+        consoleErr << args[0] << ": error:" << msg << endl;
         return EXIT_FAILURE;
     }
     catch(...)
     {
-        getErrorStream() << args[0] << ": error:" << "unknown exception" << endl;
+        consoleErr << args[0] << ": error:" << "unknown exception" << endl;
         return EXIT_FAILURE;
     }
 }