IceUtil cleanup (first commit)

3 files changed, 49 insertions, 48 deletions

diff --git a/cpp/src/slice2cppe/Gen.cpp b/cpp/src/slice2cppe/Gen.cpp
index d076c126124..9146edd8111 100644
--- a/cpp/src/slice2cppe/Gen.cpp
+++ b/cpp/src/slice2cppe/Gen.cpp
@@ -18,6 +18,7 @@
 using namespace std;
 using namespace Slice;
 using namespace IceUtil;
+using namespace IceUtilInternal;
 
 static void
 getIds(const ClassDefPtr& p, StringList& ids)
@@ -1386,7 +1387,7 @@ Slice::Gen::ProxyVisitor::visitClassDefEnd(const ClassDefPtr& p)
     StringList::const_iterator firstIter = ids.begin();
     StringList::const_iterator scopedIter = find(ids.begin(), ids.end(), p->scoped());
     assert(scopedIter != ids.end());
-    StringList::difference_type scopedPos = ice_distance(firstIter, scopedIter);
+    StringList::difference_type scopedPos = IceUtilInternal::distance(firstIter, scopedIter);
 
     C << sp;
     C << nl << "const ::std::string&" << nl << "IceProxy" << scoped << "::ice_staticId()";
@@ -1890,7 +1891,7 @@ Slice::Gen::ObjectVisitor::visitClassDefStart(const ClassDefPtr& p)
     StringList::const_iterator firstIter = ids.begin();
     StringList::const_iterator scopedIter = find(ids.begin(), ids.end(), p->scoped());
     assert(scopedIter != ids.end());
-    StringList::difference_type scopedPos = ice_distance(firstIter, scopedIter);
+    StringList::difference_type scopedPos = IceUtilInternal::distance(firstIter, scopedIter);
 
     StringList::const_iterator q1;
 
diff --git a/cpp/src/slice2cppe/Gen.h b/cpp/src/slice2cppe/Gen.h
index dd8347e5b0b..cc317addb06 100644
--- a/cpp/src/slice2cppe/Gen.h
+++ b/cpp/src/slice2cppe/Gen.h
@@ -47,13 +47,13 @@ public:
 
 private:
 
-    void writeExtraHeaders(::IceUtil::Output&);
+    void writeExtraHeaders(::IceUtilInternal::Output&);
 
-    ::IceUtil::Output H;
-    ::IceUtil::Output C;
+    ::IceUtilInternal::Output H;
+    ::IceUtilInternal::Output C;
 
-    ::IceUtil::Output implH;
-    ::IceUtil::Output implC;
+    ::IceUtilInternal::Output implH;
+    ::IceUtilInternal::Output implC;
 
     std::string _base;
     std::string _headerExtension;
@@ -69,13 +69,13 @@ private:
     {
     public:
 
-        GlobalIncludeVisitor(::IceUtil::Output&);
+        GlobalIncludeVisitor(::IceUtilInternal::Output&);
 
         virtual bool visitModuleStart(const ModulePtr&);
 
     private:
 
-        ::IceUtil::Output& H;
+        ::IceUtilInternal::Output& H;
 
         bool _finished;
     };
@@ -84,7 +84,7 @@ private:
     {
     public:
 
-        TypesVisitor(::IceUtil::Output&, ::IceUtil::Output&, const std::string&);
+        TypesVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&);
 
         virtual bool visitModuleStart(const ModulePtr&);
         virtual void visitModuleEnd(const ModulePtr&);
@@ -103,8 +103,8 @@ private:
 
         void emitUpcall(const ExceptionPtr&, const std::string&, bool = false);
 
-        ::IceUtil::Output& H;
-        ::IceUtil::Output& C;
+        ::IceUtilInternal::Output& H;
+        ::IceUtilInternal::Output& C;
 
         std::string _dllExport;
         bool _doneStaticSymbol;
@@ -116,7 +116,7 @@ private:
     {
     public:
 
-        ProxyDeclVisitor(::IceUtil::Output&, ::IceUtil::Output&, const std::string&);
+        ProxyDeclVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&);
 
         virtual bool visitUnitStart(const UnitPtr&);
         virtual void visitUnitEnd(const UnitPtr&);
@@ -126,8 +126,8 @@ private:
 
     private:
 
-        ::IceUtil::Output& H;
-        ::IceUtil::Output& C;
+        ::IceUtilInternal::Output& H;
+        ::IceUtilInternal::Output& C;
 
         std::string _dllExport;
     };
@@ -136,7 +136,7 @@ private:
     {
     public:
 
-        ProxyVisitor(::IceUtil::Output&, ::IceUtil::Output&, const std::string&);
+        ProxyVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&);
 
         virtual bool visitUnitStart(const UnitPtr&);
         virtual void visitUnitEnd(const UnitPtr&);
@@ -148,8 +148,8 @@ private:
 
     private:
 
-        ::IceUtil::Output& H;
-        ::IceUtil::Output& C;
+        ::IceUtilInternal::Output& H;
+        ::IceUtilInternal::Output& C;
 
         std::string _dllExport;
         bool _useWstring;
@@ -160,7 +160,7 @@ private:
     {
     public:
 
-        ObjectDeclVisitor(::IceUtil::Output&, ::IceUtil::Output&, const std::string&);
+        ObjectDeclVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&);
 
         virtual bool visitModuleStart(const ModulePtr&);
         virtual void visitModuleEnd(const ModulePtr&);
@@ -168,8 +168,8 @@ private:
 
     private:
 
-        ::IceUtil::Output& H;
-        ::IceUtil::Output& C;
+        ::IceUtilInternal::Output& H;
+        ::IceUtilInternal::Output& C;
 
         std::string _dllExport;
     };
@@ -178,7 +178,7 @@ private:
     {
     public:
 
-        ObjectVisitor(::IceUtil::Output&, ::IceUtil::Output&, const std::string&);
+        ObjectVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&);
 
         virtual bool visitModuleStart(const ModulePtr&);
         virtual void visitModuleEnd(const ModulePtr&);
@@ -195,8 +195,8 @@ private:
         void emitOneShotConstructor(const ClassDefPtr&);
         void emitUpcall(const ClassDefPtr&, const std::string&);
 
-        ::IceUtil::Output& H;
-        ::IceUtil::Output& C;
+        ::IceUtilInternal::Output& H;
+        ::IceUtilInternal::Output& C;
 
         std::string _dllExport;
         bool _useWstring;
@@ -207,7 +207,7 @@ private:
     {
     public:
 
-        IceInternalVisitor(::IceUtil::Output&, ::IceUtil::Output&, const std::string&);
+        IceInternalVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&);
 
         virtual bool visitUnitStart(const UnitPtr&);
         virtual void visitUnitEnd(const UnitPtr&);
@@ -216,8 +216,8 @@ private:
 
     private:
 
-        ::IceUtil::Output& H;
-        ::IceUtil::Output& C;
+        ::IceUtilInternal::Output& H;
+        ::IceUtilInternal::Output& C;
 
         std::string _dllExport;
     };
@@ -226,7 +226,7 @@ private:
     {
     public:
 
-        HandleVisitor(::IceUtil::Output&, ::IceUtil::Output&, const std::string&);
+        HandleVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&);
 
         virtual bool visitModuleStart(const ModulePtr&);
         virtual void visitModuleEnd(const ModulePtr&);
@@ -235,8 +235,8 @@ private:
 
     private:
 
-        ::IceUtil::Output& H;
-        ::IceUtil::Output& C;
+        ::IceUtilInternal::Output& H;
+        ::IceUtilInternal::Output& C;
 
         std::string _dllExport;
     };
@@ -245,7 +245,7 @@ private:
     {
     public:
 
-        ImplVisitor(::IceUtil::Output&, ::IceUtil::Output&, const std::string&);
+        ImplVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&);
 
         virtual bool visitModuleStart(const ModulePtr&);
         virtual void visitModuleEnd(const ModulePtr&);
@@ -253,8 +253,8 @@ private:
 
     private:
 
-        ::IceUtil::Output& H;
-        ::IceUtil::Output& C;
+        ::IceUtilInternal::Output& H;
+        ::IceUtilInternal::Output& C;
 
         std::string _dllExport;
         bool _useWstring;
@@ -263,7 +263,7 @@ private:
         //
         // Generate code to return a dummy value
         //
-        void writeReturn(::IceUtil::Output&, const TypePtr&, const StringList&);
+        void writeReturn(::IceUtilInternal::Output&, const TypePtr&, const StringList&);
     };
 
     class MetaDataVisitor : public ParserVisitor
@@ -296,9 +296,9 @@ private:
     };
 
     static void validateMetaData(const UnitPtr&);
-    static void printHeader(IceUtil::Output&);
-    static void printVersionCheck(IceUtil::Output&);
-    static void printDllExportStuff(IceUtil::Output&, const std::string&);
+    static void printHeader(IceUtilInternal::Output&);
+    static void printVersionCheck(IceUtilInternal::Output&);
+    static void printDllExportStuff(IceUtilInternal::Output&, const std::string&);
 };
 
 }
diff --git a/cpp/src/slice2cppe/Main.cpp b/cpp/src/slice2cppe/Main.cpp
index 2d776d8eb8d..cfc26feca6d 100644
--- a/cpp/src/slice2cppe/Main.cpp
+++ b/cpp/src/slice2cppe/Main.cpp
@@ -44,19 +44,19 @@ usage(const char* n)
 int
 main(int argc, char* argv[])
 {
-    IceUtil::Options opts;
+    IceUtilInternal::Options opts;
     opts.addOpt("h", "help");
     opts.addOpt("v", "version");
-    opts.addOpt("", "header-ext", IceUtil::Options::NeedArg, "h");
-    opts.addOpt("", "source-ext", IceUtil::Options::NeedArg, "cpp");
-    opts.addOpt("", "add-header", IceUtil::Options::NeedArg, "", IceUtil::Options::Repeat);
-    opts.addOpt("D", "", IceUtil::Options::NeedArg, "", IceUtil::Options::Repeat);
-    opts.addOpt("U", "", IceUtil::Options::NeedArg, "", IceUtil::Options::Repeat);
-    opts.addOpt("I", "", IceUtil::Options::NeedArg, "", IceUtil::Options::Repeat);
+    opts.addOpt("", "header-ext", IceUtilInternal::Options::NeedArg, "h");
+    opts.addOpt("", "source-ext", IceUtilInternal::Options::NeedArg, "cpp");
+    opts.addOpt("", "add-header", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
+    opts.addOpt("D", "", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
+    opts.addOpt("U", "", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
+    opts.addOpt("I", "", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
     opts.addOpt("E");
-    opts.addOpt("", "include-dir", IceUtil::Options::NeedArg);
-    opts.addOpt("", "output-dir", IceUtil::Options::NeedArg);
-    opts.addOpt("", "dll-export", IceUtil::Options::NeedArg);
+    opts.addOpt("", "include-dir", IceUtilInternal::Options::NeedArg);
+    opts.addOpt("", "output-dir", IceUtilInternal::Options::NeedArg);
+    opts.addOpt("", "dll-export", IceUtilInternal::Options::NeedArg);
     opts.addOpt("", "impl");
     opts.addOpt("", "depend");
     opts.addOpt("d", "debug");
@@ -68,7 +68,7 @@ main(int argc, char* argv[])
     {
         args = opts.parse(argc, (const char**)argv);
     }
-    catch(const IceUtil::BadOptException& e)
+    catch(const IceUtilInternal::BadOptException& e)
     {
         cerr << argv[0] << ": " << e.reason << endl;
         usage(argv[0]);