1 files changed, 23 insertions, 20 deletions

diff --git a/cpp/src/slice2html/Main.cpp b/cpp/src/slice2html/Main.cpp
index f91f55f433c..f8e7b22f36b 100644
--- a/cpp/src/slice2html/Main.cpp
+++ b/cpp/src/slice2html/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
 {
@@ -58,8 +59,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"
@@ -80,8 +81,10 @@ usage(const string& n)
         "--index NUM          Generate subindex if it has at least NUM entries (0 for no index, default=1).\n"
         "--summary NUM        Print a warning if a summary sentence exceeds NUM characters.\n"
         "-d, --debug          Print debug messages.\n"
-        "--ice                Allow reserved Ice prefix in Slice identifiers.\n"
-        "--underscore         Allow underscores in Slice identifiers.\n"
+        "--ice                Allow reserved Ice prefix in Slice identifiers\n"
+        "                     deprecated: use instead [[\"ice-prefix\"]] metadata.\n"
+        "--underscore         Allow underscores in Slice identifiers\n"
+        "                     deprecated: use instead [[\"underscore\"]] metadata.\n"
         ;
 }
 
@@ -118,7 +121,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]);
@@ -134,7 +137,7 @@ compile(const vector<string>& argv)
 
     if(opts.isSet("version"))
     {
-        getErrorStream() << ICE_STRING_VERSION << endl;
+        consoleErr << ICE_STRING_VERSION << endl;
         return EXIT_SUCCESS;
     }
 
@@ -177,8 +180,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]);
@@ -201,8 +204,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]);
@@ -219,7 +222,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]);
@@ -252,7 +255,7 @@ compile(const vector<string>& argv)
         if(preprocess)
         {
             char buf[4096];
-            while(fgets(buf, static_cast<int>(sizeof(buf)), cppHandle) != NULL)
+            while(fgets(buf, static_cast<int>(sizeof(buf)), cppHandle) != ICE_NULLPTR)
             {
                 if(fputs(buf, stdout) == EOF)
                 {
@@ -295,19 +298,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;
         }
     }
@@ -340,22 +343,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;
     }
 }