4 files changed, 24 insertions, 8 deletions
diff --git a/cpp/src/Ice/ice.dsp b/cpp/src/Ice/ice.dsp
index 43092917455..40038430960 100644
--- a/cpp/src/Ice/ice.dsp
+++ b/cpp/src/Ice/ice.dsp
@@ -358,6 +358,14 @@ SOURCE=.\Service.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\SliceChecksum.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\SliceChecksumDict.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\Stats.cpp
 # End Source File
 # Begin Source File
@@ -834,6 +842,14 @@ SOURCE=..\..\include\Ice\Service.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\Ice\SliceChecksum.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\Ice\SliceChecksumDict.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\Ice\Stats.h
 # End Source File
 # Begin Source File
diff --git a/cpp/src/IcePack/Client.cpp b/cpp/src/IcePack/Client.cpp
index a6510d0f1ae..1ed8d9003fc 100644
--- a/cpp/src/IcePack/Client.cpp
+++ b/cpp/src/IcePack/Client.cpp
@@ -151,10 +151,10 @@ Client::run(int argc, char* argv[])
     }
 
     Ice::SliceChecksumDict serverChecksums = admin->getSliceChecksums();
-    for(Ice::SliceChecksumDict::const_iterator p = Ice::sliceChecksums.begin(); p != Ice::sliceChecksums.end(); ++p)
+    for(Ice::SliceChecksumDict::const_iterator q = Ice::sliceChecksums.begin(); q != Ice::sliceChecksums.end(); ++q)
     {
-        Ice::SliceChecksumDict::const_iterator q = serverChecksums.find(p->first);
-        if(q == serverChecksums.end() || p->second != q->second)
+        Ice::SliceChecksumDict::const_iterator r = serverChecksums.find(q->first);
+        if(r == serverChecksums.end() || q->second != r->second)
         {
             cerr << appName() << ": server is using different Slice definitions" << endl;
         }
diff --git a/cpp/src/IceStorm/Admin.cpp b/cpp/src/IceStorm/Admin.cpp
index 2746748715e..81eed124b1b 100644
--- a/cpp/src/IceStorm/Admin.cpp
+++ b/cpp/src/IceStorm/Admin.cpp
@@ -156,10 +156,10 @@ Client::run(int argc, char* argv[])
     }
 
     Ice::SliceChecksumDict serverChecksums = manager->getSliceChecksums();
-    for(Ice::SliceChecksumDict::const_iterator p = Ice::sliceChecksums.begin(); p != Ice::sliceChecksums.end(); ++p)
+    for(Ice::SliceChecksumDict::const_iterator q = Ice::sliceChecksums.begin(); q != Ice::sliceChecksums.end(); ++q)
     {
-        Ice::SliceChecksumDict::const_iterator q = serverChecksums.find(p->first);
-        if(q == serverChecksums.end() || p->second != q->second)
+        Ice::SliceChecksumDict::const_iterator r = serverChecksums.find(q->first);
+        if(r == serverChecksums.end() || q->second != r->second)
         {
             cerr << appName() << ": server is using different Slice definitions" << endl;
         }
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp
index e5913aa6217..bb14ccb96aa 100644
--- a/cpp/src/slice2java/Gen.cpp
+++ b/cpp/src/slice2java/Gen.cpp
@@ -854,7 +854,7 @@ Slice::Gen::generateImplTie(const UnitPtr& p)
 }
 
 void
-Slice::Gen::writeChecksumClass(const string& checksumClass, const string& dir, const ChecksumMap& map)
+Slice::Gen::writeChecksumClass(const string& checksumClass, const string& dir, const ChecksumMap& m)
 {
     //
     // Attempt to open the source file for the checksum class.
@@ -893,7 +893,7 @@ Slice::Gen::writeChecksumClass(const string& checksumClass, const string& dir, c
     out << sp << nl << "static";
     out << sb;
     out << nl << "java.util.Map map = new java.util.HashMap();";
-    for(ChecksumMap::const_iterator p = map.begin(); p != map.end(); ++p)
+    for(ChecksumMap::const_iterator p = m.begin(); p != m.end(); ++p)
     {
         out << nl << "map.put(\"" << p->first << "\", \"";
         ostringstream str;