1 files changed, 10 insertions, 10 deletions
diff --git a/cpp/src/slice2freezej/Main.cpp b/cpp/src/slice2freezej/Main.cpp
index 18c9f7ec68c..32a8ee1057c 100644
--- a/cpp/src/slice2freezej/Main.cpp
+++ b/cpp/src/slice2freezej/Main.cpp
@@ -1216,8 +1216,8 @@ FreezeGenerator::generate(UnitPtr& u, const Index& index)
 void
 usage(const char* n)
 {
-    cerr << "Usage: " << n << " [options] [slice-files...]\n";
-    cerr <<
+    getErrorStream() << "Usage: " << n << " [options] [slice-files...]\n";
+    getErrorStream() <<
         "Options:\n"
         "-h, --help                Show this message.\n"
         "-v, --version             Display the Ice version.\n"
@@ -1284,7 +1284,7 @@ compile(int argc, char* argv[])
     }
     catch(const IceUtilInternal::BadOptException& e)
     {
-        cerr << argv[0] << ": error: " << e.reason << endl;
+        getErrorStream() << argv[0] << ": error: " << e.reason << endl;
         usage(argv[0]);
         return EXIT_FAILURE;
     }
@@ -1297,7 +1297,7 @@ compile(int argc, char* argv[])
 
     if(opts.isSet("version"))
     {
-        cerr << ICE_STRING_VERSION << endl;
+        getErrorStream() << ICE_STRING_VERSION << endl;
         return EXIT_SUCCESS;
     }
 
@@ -1735,30 +1735,30 @@ main(int argc, char* argv[])
     }
     catch(const IceUtil::Exception& ex)
     {
-        cerr << ex.what() << endl;
+        getErrorStream() << argv[0] << ": error:" << ex.what() << endl;
 #ifdef __GNUC__
-        cerr << ex.ice_stackTrace() << endl;
+        getErrorStream() << ex.ice_stackTrace() << endl;
 #endif
         return EXIT_FAILURE;
     }
     catch(const std::exception& ex)
     {
-        cerr << ex.what() << endl;
+        getErrorStream() << argv[0] << ": error:" << ex.what() << endl;
         return EXIT_FAILURE;
     }
     catch(const std::string& msg)
     {
-        cerr << msg << endl;
+        getErrorStream() << argv[0] << ": error:" << msg << endl;
         return EXIT_FAILURE;
     }
     catch(const char* msg)
     {
-        cerr << msg << endl;
+        getErrorStream() << argv[0] << ": error:" << msg << endl;
         return EXIT_FAILURE;
     }
     catch(...)
     {
-        cerr << "unknown exception" << endl;
+        getErrorStream() << argv[0] << ": error:" << "unknown exception" << endl;
         return EXIT_FAILURE;
     }
 }