Fixed SunOS C++ compiler warnings (bug 723)

3 files changed, 17 insertions, 19 deletions

diff --git a/cpp/src/FreezeScript/DumpDB.cpp b/cpp/src/FreezeScript/DumpDB.cpp
index ed387a2f9e5..c1f0f789d91 100644
--- a/cpp/src/FreezeScript/DumpDB.cpp
+++ b/cpp/src/FreezeScript/DumpDB.cpp
@@ -191,8 +191,8 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
     }
     if(opts.isSet("load"))
     {
-        vector<string> args = opts.argVec("load");
-	for(vector<string>::const_iterator i = args.begin(); i != args.end(); ++i)
+        vector<string> optArgs = opts.argVec("load");
+	for(vector<string>::const_iterator i = optArgs.begin(); i != optArgs.end(); ++i)
 	{
 	    slice.push_back(*i);
 	}
diff --git a/cpp/src/FreezeScript/DumpDescriptors.cpp b/cpp/src/FreezeScript/DumpDescriptors.cpp
index 6c815f4eaa9..ab99ef3d9b8 100644
--- a/cpp/src/FreezeScript/DumpDescriptors.cpp
+++ b/cpp/src/FreezeScript/DumpDescriptors.cpp
@@ -1888,8 +1888,8 @@ FreezeScript::DumpVisitor::dump(const DataPtr& data)
         // object's actual type. If no descriptor is found, attempt to find a
         // descriptor for the object's base types (including Ice::Object).
         //
-        ObjectDataPtr data = obj->getValue();
-        Slice::TypePtr cls = data->getType(); // Actual type
+        ObjectDataPtr objData = obj->getValue();
+        Slice::TypePtr cls = objData->getType(); // Actual type
         bool checkContents = true;
         while(cls)
         {
@@ -1899,7 +1899,7 @@ FreezeScript::DumpVisitor::dump(const DataPtr& data)
             if(p != _info->dumpMap.end())
             {
                 SymbolTablePtr sym = new SymbolTableI(_factory, _unit, _errorReporter, _info, _info->symbolTable);
-                sym->add("value", data);
+                sym->add("value", objData);
                 p->second->execute(sym, _info);
                 base = p->second->base();
                 if(checkContents)
diff --git a/cpp/src/FreezeScript/Util.cpp b/cpp/src/FreezeScript/Util.cpp
index dd5d58a982a..25c9d2f0b6d 100644
--- a/cpp/src/FreezeScript/Util.cpp
+++ b/cpp/src/FreezeScript/Util.cpp
@@ -19,7 +19,6 @@ FreezeScript::typeToString(const TypePtr& type)
 {
     BuiltinPtr b = BuiltinPtr::dynamicCast(type);
     ContainedPtr c = ContainedPtr::dynamicCast(type);
-    ProxyPtr p = ProxyPtr::dynamicCast(type);
     if(b)
     {
         return b->kindAsString();
@@ -53,20 +52,19 @@ FreezeScript::ignoreType(const string& type)
 }
 
 void
-FreezeScript::createEvictorSliceTypes(const Slice::UnitPtr& unit)
+FreezeScript::createEvictorSliceTypes(const Slice::UnitPtr& u)
 {
-    string scoped;
     Slice::TypeList l;
     Slice::ContainedList c;
 
     //
     // Create the Ice module if necessary.
     //
-    c = unit->lookupContained("Ice", false);
+    c = u->lookupContained("Ice", false);
     Slice::ModulePtr ice;
     if(c.empty())
     {
-        ice = unit->createModule("Ice");
+        ice = u->createModule("Ice");
     }
     else
     {
@@ -80,13 +78,13 @@ FreezeScript::createEvictorSliceTypes(const Slice::UnitPtr& unit)
     //
     // Create the Slice definition for Ice::Identity if it doesn't exist.
     //
-    scoped = "::Ice::Identity";
-    l = unit->lookupTypeNoBuiltin(scoped, false);
+    string scoped = "::Ice::Identity";
+    l = u->lookupTypeNoBuiltin(scoped, false);
     Slice::StructPtr identity;
     if(l.empty())
     {
         identity = ice->createStruct("Identity", false);
-        Slice::TypePtr str = unit->builtin(Slice::Builtin::KindString);
+        Slice::TypePtr str = u->builtin(Slice::Builtin::KindString);
         identity->createDataMember("name", str);
         identity->createDataMember("category", str);
     }
@@ -103,11 +101,11 @@ FreezeScript::createEvictorSliceTypes(const Slice::UnitPtr& unit)
     //
     // Create the Freeze module if necessary.
     //
-    c = unit->lookupContained("Freeze", false);
+    c = u->lookupContained("Freeze", false);
     Slice::ModulePtr freeze;
     if(c.empty())
     {
-        freeze = unit->createModule("Freeze");
+        freeze = u->createModule("Freeze");
     }
     else
     {
@@ -123,12 +121,12 @@ FreezeScript::createEvictorSliceTypes(const Slice::UnitPtr& unit)
     // Create the Slice definition for Freeze::Statistics if it doesn't exist.
     //
     scoped = "::Freeze::Statistics";
-    l = unit->lookupTypeNoBuiltin(scoped, false);
+    l = u->lookupTypeNoBuiltin(scoped, false);
     Slice::StructPtr stats;
     if(l.empty())
     {
         stats = freeze->createStruct("Statistics", false);
-        Slice::TypePtr tl = unit->builtin(Slice::Builtin::KindLong);
+        Slice::TypePtr tl = u->builtin(Slice::Builtin::KindLong);
         stats->createDataMember("creationTime", tl);
         stats->createDataMember("lastSaveTime", tl);
         stats->createDataMember("avgSaveTime", tl);
@@ -147,11 +145,11 @@ FreezeScript::createEvictorSliceTypes(const Slice::UnitPtr& unit)
     // Create the Slice definition for Freeze::ObjectRecord if it doesn't exist.
     //
     scoped = "::Freeze::ObjectRecord";
-    l = unit->lookupTypeNoBuiltin(scoped, false);
+    l = u->lookupTypeNoBuiltin(scoped, false);
     if(l.empty())
     {
         Slice::StructPtr rec = freeze->createStruct("ObjectRecord", false);
-        Slice::TypePtr obj = unit->builtin(Slice::Builtin::KindObject);
+        Slice::TypePtr obj = u->builtin(Slice::Builtin::KindObject);
         rec->createDataMember("servant", obj);
         rec->createDataMember("stats", stats);
     }