5 files changed, 5 insertions, 2 deletions
diff --git a/cpp/src/Ice/GC.cpp b/cpp/src/Ice/GC.cpp
index 463eff13fd4..c427416b680 100755
--- a/cpp/src/Ice/GC.cpp
+++ b/cpp/src/Ice/GC.cpp
@@ -264,7 +264,7 @@ IceInternal::GC::collectGarbage()
     counts.clear();
 
     {
-	Monitor<Mutex>::Lock sync(*this);
+	Monitor<Mutex>::Lock sync2(*this);
 
 	_collecting = false;
     }
diff --git a/cpp/src/IceGrid/AdminI.cpp b/cpp/src/IceGrid/AdminI.cpp
index 8ac5c45f1a8..7bf073fff5f 100644
--- a/cpp/src/IceGrid/AdminI.cpp
+++ b/cpp/src/IceGrid/AdminI.cpp
@@ -751,6 +751,7 @@ AdminI::getNodeHostname(const string& name, const Current&) const
 	ostringstream os;
 	os << ex;
 	throw NodeUnreachableException(name, os.str());
+	return ""; // Keep the compiler happy.
     }
 	return ""; // Keep the compiler happy.
 }
diff --git a/cpp/src/IcePatch2/Util.cpp b/cpp/src/IcePatch2/Util.cpp
index 09bfbce039a..ac14c2a5a36 100644
--- a/cpp/src/IcePatch2/Util.cpp
+++ b/cpp/src/IcePatch2/Util.cpp
@@ -134,7 +134,7 @@ IcePatch2::readFileInfo(FILE* fp, FileInfo& info)
 
 	int len = strlen(buf);
 	if(buf[len-1] == '\n')
-	{
+	{
 	    break;
 	}
     }
diff --git a/cpp/src/slice2cppe/Gen.cpp b/cpp/src/slice2cppe/Gen.cpp
index f667d4274e2..ca59f265e46 100644
--- a/cpp/src/slice2cppe/Gen.cpp
+++ b/cpp/src/slice2cppe/Gen.cpp
@@ -1734,6 +1734,7 @@ Slice::Gen::ObjectVisitor::visitClassDefStart(const ClassDefPtr& p)
     vector<string> allParamDecls;
     DataMemberList::const_iterator q;
     vector<string>::const_iterator pi;
+    DataMemberList::const_iterator q;
 
     for(q = dataMembers.begin(); q != dataMembers.end(); ++q)
     {
diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp
index d9baeb39204..c11d5bc1941 100755
--- a/cpp/src/slice2cs/Gen.cpp
+++ b/cpp/src/slice2cs/Gen.cpp
@@ -4791,6 +4791,7 @@ Slice::Gen::BaseImplVisitor::writeOperation(const OperationPtr& op, bool comment
 	ParamDeclList::const_iterator i;
     if(!cl->isLocal() && (cl->hasMetaData("amd") || op->hasMetaData("amd")))
     {
+	ParamDeclList::const_iterator i;
         vector<string> pDecl = getParamsAsync(op, true);
 
 	_out << "public ";