3 files changed, 25 insertions, 24 deletions

diff --git a/cpp/src/slice2html/Gen.cpp b/cpp/src/slice2html/Gen.cpp
index e88d3d7e2ea..93e97489b4f 100644
--- a/cpp/src/slice2html/Gen.cpp
+++ b/cpp/src/slice2html/Gen.cpp
@@ -27,6 +27,7 @@
 using namespace std;
 using namespace Slice;
 using namespace IceUtil;
+using namespace IceUtilInternal;
 
 namespace Slice
 {
diff --git a/cpp/src/slice2html/Gen.h b/cpp/src/slice2html/Gen.h
index a2cf62b692d..665f08a08f5 100644
--- a/cpp/src/slice2html/Gen.h
+++ b/cpp/src/slice2html/Gen.h
@@ -38,7 +38,7 @@ public:
 
 protected:
 
-    GeneratorBase(::IceUtil::XMLOutput&, const Files&);
+    GeneratorBase(::IceUtilInternal::XMLOutput&, const Files&);
     virtual ~GeneratorBase() = 0;
 
     void openDoc(const ::std::string&, const std::string&, const std::string& = "", const std::string& = "");
@@ -68,7 +68,7 @@ protected:
     static ::std::string getImageDir();
     static ::std::string getLogoURL();
 
-    ::IceUtil::XMLOutput& _out;
+    ::IceUtilInternal::XMLOutput& _out;
 
     static size_t _indexCount;
     static size_t _warnSummary;
@@ -117,7 +117,7 @@ private:
     typedef ::std::pair< ::std::string, ::std::string> StringPair;
     typedef ::std::vector<StringPair> ModuleDescriptions;
     ModuleDescriptions _modules;
-    ::IceUtil::XMLOutput _out;
+    ::IceUtilInternal::XMLOutput _out;
 };
 
 class FileVisitor : private ::IceUtil::noncopyable, public ParserVisitor
@@ -170,7 +170,7 @@ private:
 
     ModuleList _modules;
     ContainedList _symbols;
-    ::IceUtil::XMLOutput _out;
+    ::IceUtilInternal::XMLOutput _out;
 };
 
 class TOCVisitor : private ::IceUtil::noncopyable, public ParserVisitor
@@ -193,7 +193,7 @@ class ModuleGenerator : private GeneratorBase
 {
 public:
 
-    ModuleGenerator(::IceUtil::XMLOutput&, const Files&);
+    ModuleGenerator(::IceUtilInternal::XMLOutput&, const Files&);
     void generate(const ModulePtr&);
 
 private:
@@ -205,7 +205,7 @@ class ExceptionGenerator : private GeneratorBase
 {
 public:
 
-    ExceptionGenerator(::IceUtil::XMLOutput&, const Files&);
+    ExceptionGenerator(::IceUtilInternal::XMLOutput&, const Files&);
     void generate(const ExceptionPtr&);
 };
 
@@ -213,7 +213,7 @@ class ClassGenerator : private GeneratorBase
 {
 public:
 
-    ClassGenerator(::IceUtil::XMLOutput&, const Files&);
+    ClassGenerator(::IceUtilInternal::XMLOutput&, const Files&);
     void generate(const ClassDefPtr&);
 };
 
@@ -221,7 +221,7 @@ class StructGenerator : private GeneratorBase
 {
 public:
 
-    StructGenerator(::IceUtil::XMLOutput&, const Files&);
+    StructGenerator(::IceUtilInternal::XMLOutput&, const Files&);
     void generate(const StructPtr&);
 };
 
@@ -229,7 +229,7 @@ class EnumGenerator : private GeneratorBase
 {
 public:
 
-    EnumGenerator(::IceUtil::XMLOutput&, const Files&);
+    EnumGenerator(::IceUtilInternal::XMLOutput&, const Files&);
     void generate(const EnumPtr&);
 };
 
diff --git a/cpp/src/slice2html/Main.cpp b/cpp/src/slice2html/Main.cpp
index 5552987b908..08d25c5f403 100644
--- a/cpp/src/slice2html/Main.cpp
+++ b/cpp/src/slice2html/Main.cpp
@@ -47,23 +47,23 @@ 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("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("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("", "output-dir", IceUtil::Options::NeedArg, ".");
-    opts.addOpt("", "hdr", IceUtil::Options::NeedArg);
-    opts.addOpt("", "ftr", IceUtil::Options::NeedArg);
-    opts.addOpt("", "indexhdr", IceUtil::Options::NeedArg);
-    opts.addOpt("", "indexftr", IceUtil::Options::NeedArg);
-    opts.addOpt("", "index", IceUtil::Options::NeedArg, "1");
-    opts.addOpt("", "image-dir", IceUtil::Options::NeedArg);
-    opts.addOpt("", "logo-url", IceUtil::Options::NeedArg);
-    opts.addOpt("", "search", IceUtil::Options::NeedArg);
-    opts.addOpt("", "summary", IceUtil::Options::NeedArg, "0");
+    opts.addOpt("", "output-dir", IceUtilInternal::Options::NeedArg, ".");
+    opts.addOpt("", "hdr", IceUtilInternal::Options::NeedArg);
+    opts.addOpt("", "ftr", IceUtilInternal::Options::NeedArg);
+    opts.addOpt("", "indexhdr", IceUtilInternal::Options::NeedArg);
+    opts.addOpt("", "indexftr", IceUtilInternal::Options::NeedArg);
+    opts.addOpt("", "index", IceUtilInternal::Options::NeedArg, "1");
+    opts.addOpt("", "image-dir", IceUtilInternal::Options::NeedArg);
+    opts.addOpt("", "logo-url", IceUtilInternal::Options::NeedArg);
+    opts.addOpt("", "search", IceUtilInternal::Options::NeedArg);
+    opts.addOpt("", "summary", IceUtilInternal::Options::NeedArg, "0");
     opts.addOpt("d", "debug");
     opts.addOpt("", "ice");
 
@@ -72,7 +72,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]);