more fixes

3 files changed, 25 insertions, 25 deletions

diff --git a/cpp/src/slice2cpp/.depend b/cpp/src/slice2cpp/.depend
index 7681b5dbbc3..53b14f49c16 100644
--- a/cpp/src/slice2cpp/.depend
+++ b/cpp/src/slice2cpp/.depend
@@ -1,3 +1,3 @@
-Gen.o: Gen.cpp ../../include/Ice/Functional.h ../../include/Ice/Handle.h ../../include/Ice/Config.h Gen.h ../../include/Slice/Parser.h ../../include/Ice/Shared.h ../../include/Slice/OutputUtil.h GenUtil.h
-GenUtil.o: GenUtil.cpp GenUtil.h ../../include/Slice/Parser.h ../../include/Ice/Shared.h ../../include/Ice/Config.h ../../include/Ice/Handle.h ../../include/Slice/OutputUtil.h
-Main.o: Main.cpp Gen.h ../../include/Slice/Parser.h ../../include/Ice/Shared.h ../../include/Ice/Config.h ../../include/Ice/Handle.h ../../include/Slice/OutputUtil.h
+Gen.o: Gen.cpp ../../include/IceUtil/Functional.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Config.h Gen.h ../../include/Slice/Parser.h ../../include/IceUtil/Shared.h ../../include/Slice/OutputUtil.h GenUtil.h
+GenUtil.o: GenUtil.cpp GenUtil.h ../../include/Slice/Parser.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Handle.h ../../include/Slice/OutputUtil.h
+Main.o: Main.cpp Gen.h ../../include/Slice/Parser.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Handle.h ../../include/Slice/OutputUtil.h
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index 040da988a2c..5215bf7f554 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -8,7 +8,7 @@
 //
 // **********************************************************************
 
-#include <Ice/Functional.h>
+#include <IceUtil/Functional.h>
 #include <Gen.h>
 #include <GenUtil.h>
 #include <limits>
@@ -433,15 +433,15 @@ Slice::Gen::TypesVisitor::visitEnum(const EnumPtr& p)
     C << sp;
     C << nl << "void" << nl << scope << "::__write(::IceInternal::Stream* __os, " << scoped << " v)";
     C << sb;
-    if (sz <= numeric_limits<Ice::Byte>::max())
+    if (sz <= 0x7f)
     {
 	C << nl << "__os->write(static_cast< ::Ice::Byte>(v));";
     }
-    else if (sz <= numeric_limits<Ice::Short>::max())
+    else if (sz <= 0x7fff)
     {
 	C << nl << "__os->write(static_cast< ::Ice::Short>(v));";
     }
-    else if (sz <= numeric_limits<Ice::Int>::max())
+    else if (sz <= 0x7fffffff)
     {
 	C << nl << "__os->write(static_cast< ::Ice::Int>(v));";
     }
@@ -453,19 +453,19 @@ Slice::Gen::TypesVisitor::visitEnum(const EnumPtr& p)
     C << sp;
     C << nl << "void" << nl << scope << "::__read(::IceInternal::Stream* __is, " << scoped << "& v)";
     C << sb;
-    if (sz <= numeric_limits<Ice::Byte>::max())
+    if (sz <= 0x7f)
     {
 	C << nl << "::Ice::Byte val;";
 	C << nl << "__is->read(val);";
 	C << nl << "v = static_cast< " << scoped << ">(val);";
     }
-    else if (sz <= numeric_limits<Ice::Short>::max())
+    else if (sz <= 0x7fff)
     {
 	C << nl << "::Ice::Short val;";
 	C << nl << "__is->read(val);";
 	C << nl << "v = static_cast< " << scoped << ">(val);";
     }
-    else if (sz <= numeric_limits<Ice::Int>::max())
+    else if (sz <= 0x7fffffff)
     {
 	C << nl << "::Ice::Int val;";
 	C << nl << "__is->read(val);";
@@ -1147,7 +1147,7 @@ Slice::Gen::DelegateMVisitor::visitOperation(const OperationPtr& p)
 	C << nl << "switch (__exnum)";
 	C << sb;
 	TypeList::iterator r;
-	Ice::Int cnt = 0;
+	int cnt = 0;
 	for (r = throws.begin(); r != throws.end(); ++r)
 	{
 	    C << nl << "case " << cnt++ << ':';
@@ -1415,7 +1415,7 @@ Slice::Gen::ObjectVisitor::visitClassDefStart(const ClassDefPtr& p)
     {
 	ClassList allBases = p->allBases();
 	StringList ids;
-	transform(allBases.begin(), allBases.end(), back_inserter(ids), ::Ice::memFun(&ClassDef::scoped));
+	transform(allBases.begin(), allBases.end(), back_inserter(ids), ::IceUtil::memFun(&ClassDef::scoped));
 	StringList other;
 	other.push_back(scoped);
 	other.push_back("::Ice::Object");
@@ -1448,7 +1448,7 @@ Slice::Gen::ObjectVisitor::visitClassDefStart(const ClassDefPtr& p)
 	}
 	StringList classIds;
 	transform(allBaseClasses.begin(), allBaseClasses.end(), back_inserter(classIds),
-		  ::Ice::memFun(&ClassDef::scoped));
+		  ::IceUtil::memFun(&ClassDef::scoped));
 	if (!p->isInterface())
 	{
 	    classIds.push_front(scoped);
@@ -1527,7 +1527,7 @@ Slice::Gen::ObjectVisitor::visitClassDefEnd(const ClassDefPtr& p)
 	{
 	    StringList allOpNames;
 	    transform(allOperations.begin(), allOperations.end(), back_inserter(allOpNames),
-		      ::Ice::memFun(&Operation::name));
+		      ::IceUtil::memFun(&Operation::name));
 	    allOpNames.push_back("_isA");
 	    allOpNames.push_back("_ping");
 	    allOpNames.sort();
@@ -1732,7 +1732,7 @@ Slice::Gen::ObjectVisitor::visitOperation(const OperationPtr& p)
 	{
 	    C << eb;
 	    TypeList::iterator r;
-	    Ice::Int cnt = 0;
+	    int cnt = 0;
 	    for (r = throws.begin(); r != throws.end(); ++r)
 	    {
 		C << nl << "catch(" << exceptionTypeToString(*r) << " __ex)";
diff --git a/cpp/src/slice2cpp/Gen.h b/cpp/src/slice2cpp/Gen.h
index 18a62288adc..a0b44a45dc7 100644
--- a/cpp/src/slice2cpp/Gen.h
+++ b/cpp/src/slice2cpp/Gen.h
@@ -17,7 +17,7 @@
 namespace Slice
 {
 
-class Gen : public ::Ice::noncopyable
+class Gen : public ::IceUtil::noncopyable
 {
 public:
 
@@ -45,7 +45,7 @@ private:
     std::vector<std::string> _includePaths;
     std::string _dllExport;
 
-    class TypesVisitor : public ::Ice::noncopyable, public ParserVisitor
+    class TypesVisitor : public ::IceUtil::noncopyable, public ParserVisitor
     {
     public:
 
@@ -66,7 +66,7 @@ private:
 	std::string _dllExport;
     };
 
-    class ProxyDeclVisitor : public ::Ice::noncopyable, public ParserVisitor
+    class ProxyDeclVisitor : public ::IceUtil::noncopyable, public ParserVisitor
     {
     public:
 
@@ -86,7 +86,7 @@ private:
 	std::string _dllExport;
     };
 
-    class ProxyVisitor : public ::Ice::noncopyable, public ParserVisitor
+    class ProxyVisitor : public ::IceUtil::noncopyable, public ParserVisitor
     {
     public:
 
@@ -108,7 +108,7 @@ private:
 	std::string _dllExport;
     };
 
-    class DelegateVisitor : public ::Ice::noncopyable, public ParserVisitor
+    class DelegateVisitor : public ::IceUtil::noncopyable, public ParserVisitor
     {
     public:
 
@@ -130,7 +130,7 @@ private:
 	std::string _dllExport;
     };
 
-    class DelegateMVisitor : public ::Ice::noncopyable, public ParserVisitor
+    class DelegateMVisitor : public ::IceUtil::noncopyable, public ParserVisitor
     {
     public:
 
@@ -152,7 +152,7 @@ private:
 	std::string _dllExport;
     };
 
-    class ObjectDeclVisitor : public ::Ice::noncopyable, public ParserVisitor
+    class ObjectDeclVisitor : public ::IceUtil::noncopyable, public ParserVisitor
     {
     public:
 
@@ -170,7 +170,7 @@ private:
 	std::string _dllExport;
     };
 
-    class ObjectVisitor : public ::Ice::noncopyable, public ParserVisitor
+    class ObjectVisitor : public ::IceUtil::noncopyable, public ParserVisitor
     {
     public:
 
@@ -191,7 +191,7 @@ private:
 	std::string _dllExport;
     };
 
-    class IceVisitor : public ::Ice::noncopyable, public ParserVisitor
+    class IceVisitor : public ::IceUtil::noncopyable, public ParserVisitor
     {
     public:
 
@@ -210,7 +210,7 @@ private:
 	std::string _dllExport;
     };
 
-    class HandleVisitor : public ::Ice::noncopyable, public ParserVisitor
+    class HandleVisitor : public ::IceUtil::noncopyable, public ParserVisitor
     {
     public: