7 files changed, 17 insertions, 19 deletions
diff --git a/cpp/demo/Freeze/bench/bench.dsp b/cpp/demo/Freeze/bench/bench.dsp
index c67164f43fd..966d440c43e 100644
--- a/cpp/demo/Freeze/bench/bench.dsp
+++ b/cpp/demo/Freeze/bench/bench.dsp
@@ -153,7 +153,7 @@ InputPath=.\Test.ice
 
 BuildCmds= \
 	..\..\..\bin\slice2cpp.exe Test.ice \
-	..\..\..\bin\slice2fre --dict Demo::Struct1Class1Map,Demo::Struct1,Demo::Class1  --dict Demo::Struct1ObjectMap,Demo::Struct1,Object          --dict Demo::IndexedIntIntMap,int,int --dict-index Demo::IndexedIntIntMap          --dict Demo::IndexedStruct1Struct2Map,Demo::Struct1,Demo::Struct2          --dict-index Demo::IndexedStruct1Struct2Map,s,case-insensitive          --dict-index Demo::IndexedStruct1Struct2Map,s1          --dict Demo::IndexedStruct1Class1Map,Demo::Struct1,Demo::Class1          --dict-index Demo::IndexedStruct1Class1Map,s,case-sensitive BenchTypes Test.ice \
+	..\..\..\bin\slice2freeze.exe --dict Demo::IntIntMap,int,int --dict Demo::Struct1Struct2Map,Demo::Struct1,Demo::Struct2  --dict Demo::Struct1Class1Map,Demo::Struct1,Demo::Class1  --dict Demo::Struct1ObjectMap,Demo::Struct1,Object          --dict Demo::IndexedIntIntMap,int,int --dict-index Demo::IndexedIntIntMap          --dict Demo::IndexedStruct1Struct2Map,Demo::Struct1,Demo::Struct2          --dict-index Demo::IndexedStruct1Struct2Map,s,case-insensitive          --dict-index Demo::IndexedStruct1Struct2Map,s1          --dict Demo::IndexedStruct1Class1Map,Demo::Struct1,Demo::Class1          --dict-index Demo::IndexedStruct1Class1Map,s,case-sensitive BenchTypes Test.ice \
 	
 
 "Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
diff --git a/cpp/src/Freeze/MapI.cpp b/cpp/src/Freeze/MapI.cpp
index 5470f27d9e0..a59581b5124 100644
--- a/cpp/src/Freeze/MapI.cpp
+++ b/cpp/src/Freeze/MapI.cpp
@@ -1171,9 +1171,9 @@ Freeze::MapIndexI::~MapIndexI()
 }
 
 IteratorHelper* 
-Freeze::MapIndexI::untypedFind(const Key& k, bool ro, const MapHelperI& map) const
+Freeze::MapIndexI::untypedFind(const Key& k, bool ro, const MapHelperI& m) const
 {
-    auto_ptr<IteratorHelperI> r(new IteratorHelperI(map, ro, _index));
+    auto_ptr<IteratorHelperI> r(new IteratorHelperI(m, ro, _index));
 
     if(r->find(k))
     {
diff --git a/cpp/src/Freeze/SharedDb.cpp b/cpp/src/Freeze/SharedDb.cpp
index 4cb75641f89..4d439f48132 100644
--- a/cpp/src/Freeze/SharedDb.cpp
+++ b/cpp/src/Freeze/SharedDb.cpp
@@ -24,7 +24,7 @@ StaticMutex _refCountMutex = ICE_STATIC_MUTEX_INITIALIZER;
 
 }
 
-Freeze::SharedDb::Map* Freeze::SharedDb::sharedDbMap = 0;
+Freeze::SharedDb::SharedDbMap* Freeze::SharedDb::sharedDbMap = 0;
 
 Freeze::SharedDbPtr 
 Freeze::SharedDb::get(const ConnectionIPtr& connection, 
@@ -36,7 +36,7 @@ Freeze::SharedDb::get(const ConnectionIPtr& connection,
 
     if(sharedDbMap == 0)
     {
-	sharedDbMap = new Map;
+	sharedDbMap = new SharedDbMap;
     }
 
     MapKey key;
@@ -45,7 +45,7 @@ Freeze::SharedDb::get(const ConnectionIPtr& connection,
     key.dbName = dbName;
 
     {
-	Map::iterator p = sharedDbMap->find(key);
+	SharedDbMap::iterator p = sharedDbMap->find(key);
 	if(p != sharedDbMap->end())
 	{
 	    p->second->connectIndices(indices);
@@ -61,8 +61,8 @@ Freeze::SharedDb::get(const ConnectionIPtr& connection,
     //
     // Insert it into the map
     //
-    pair<Map::iterator, bool> insertResult;
-    insertResult= sharedDbMap->insert(Map::value_type(key, result.get()));
+    pair<SharedDbMap::iterator, bool> insertResult;
+    insertResult= sharedDbMap->insert(SharedDbMap::value_type(key, result.get()));
     assert(insertResult.second);
     
     return result.release();
diff --git a/cpp/src/Freeze/SharedDb.h b/cpp/src/Freeze/SharedDb.h
index 406916541d7..42cc3db72db 100644
--- a/cpp/src/Freeze/SharedDb.h
+++ b/cpp/src/Freeze/SharedDb.h
@@ -96,7 +96,7 @@ private:
 	operator<(const MapKey& rhs) const;
     };
 
-    typedef std::map<MapKey, Freeze::SharedDb*> Map;
+    typedef std::map<MapKey, Freeze::SharedDb*> SharedDbMap;
    
     SharedDb(const MapKey&, const ConnectionIPtr&, 
 	     const std::vector<MapIndexBasePtr>&, bool);
@@ -110,7 +110,7 @@ private:
 
     IndexMap _indices;
 
-    static Map* sharedDbMap;
+    static SharedDbMap* sharedDbMap;
 };
 
 inline const std::string& 
diff --git a/cpp/src/slice2freeze/Main.cpp b/cpp/src/slice2freeze/Main.cpp
index 457c062a85e..3ae432315d7 100644
--- a/cpp/src/slice2freeze/Main.cpp
+++ b/cpp/src/slice2freeze/Main.cpp
@@ -447,7 +447,7 @@ writeDictWithIndicesC(const string& name, const string& absolute, const Dict& di
     // Constructor
     //
     
-    C << sp << nl << absolute << "::" << name << "::" << name
+    C << sp << nl << absolute << "::" << name
       << "(const Freeze::ConnectionPtr& __connection, const std::string& __dbName , bool __createDb)";
     
     C.inc();
diff --git a/cpp/test/Freeze/dbmap/Client.cpp b/cpp/test/Freeze/dbmap/Client.cpp
index 3b83d9de0d8..3a8d6218f99 100644
--- a/cpp/test/Freeze/dbmap/Client.cpp
+++ b/cpp/test/Freeze/dbmap/Client.cpp
@@ -491,11 +491,11 @@ run(const CommunicatorPtr& communicator, const string& envName, const string&dbN
     populateDB(connection, m);
 
     size_t length = alphabet.size();
-    for(size_t j = 0; j < length; ++j)
+    for(size_t k = 0; k < length; ++k)
     {
-	p = m.findByValue(static_cast<Int>(j));
+	p = m.findByValue(static_cast<Int>(k));
 	test(p != m.end());
-	test(p->first == alphabet[j]);
+	test(p->first == alphabet[k]);
 	test(++p == m.end());
     }
 
@@ -529,7 +529,7 @@ run(const CommunicatorPtr& communicator, const string& envName, const string&dbN
 	p.set(18);
 	test(false);
     }
-    catch(const DatabaseException& ex)
+    catch(const DatabaseException&)
     {
 	// Expected
     }
diff --git a/cpp/test/Freeze/dbmap/dbmap.dsp b/cpp/test/Freeze/dbmap/dbmap.dsp
index 94a7ce4acb4..9fd5a8f3617 100644
--- a/cpp/test/Freeze/dbmap/dbmap.dsp
+++ b/cpp/test/Freeze/dbmap/dbmap.dsp
@@ -120,8 +120,7 @@ USERDEP__DUMMY="..\..\..\bin\slice2freeze.exe"	"..\..\..\lib\slice.lib"
 InputPath=dummy.ice
 
 BuildCmds= \
-	..\..\..\bin\slice2freeze.exe --dict Test::ByteIntMap,byte,int --dict-index Test::ByteIntMap ByteIntMap \
-	
+	..\..\..\bin\slice2freeze.exe --dict Test::ByteIntMap,byte,int --dict-index Test::ByteIntMap ByteIntMap
 
 "ByteIntMap.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
@@ -137,8 +136,7 @@ USERDEP__DUMMY="..\..\..\bin\slice2freeze.exe"
 InputPath=dummy.ice
 
 BuildCmds= \
-	..\..\..\bin\slice2freeze.exe  --dict Test::ByteIntMap,byte,int --dict-index Test::ByteIntMap ByteIntMap \	
-
+	..\..\..\bin\slice2freeze.exe  --dict Test::ByteIntMap,byte,int --dict-index Test::ByteIntMap ByteIntMap
 
 "ByteIntMap.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)