5 files changed, 11 insertions, 12 deletions
diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp
index 6470572218e..d392020a712 100644
--- a/cpp/src/Ice/BasicStream.cpp
+++ b/cpp/src/Ice/BasicStream.cpp
@@ -355,7 +355,7 @@ IceInternal::BasicStream::startWriteSlice()
 void
 IceInternal::BasicStream::endWriteSlice()
 {
-    Int sz = b.size() - _writeSlice + sizeof(Int);
+    Int sz = static_cast<Int>(b.size() - _writeSlice + sizeof(Int));
     const Byte* p = reinterpret_cast<const Byte*>(&sz);
 #ifdef ICE_BIG_ENDIAN
     reverse_copy(p, p + sizeof(Int), b.begin() + _writeSlice - sizeof(Int));
diff --git a/cpp/src/Ice/Connection.cpp b/cpp/src/Ice/Connection.cpp
index 8776d260c92..4fa1d81b8e2 100644
--- a/cpp/src/Ice/Connection.cpp
+++ b/cpp/src/Ice/Connection.cpp
@@ -533,7 +533,7 @@ IceInternal::Connection::sendAsyncRequest(const OutgoingAsyncPtr& out)
 	    // No compression, just fill in the message size.
 	    //
 	    Int sz = static_cast<Int>(os->b.size());
-	    const Byte* p = reinterpret_cast<const Byte*>(&sz);
+	    p = reinterpret_cast<const Byte*>(&sz);
 #ifdef ICE_BIG_ENDIAN
 	    reverse_copy(p, p + sizeof(Int), os->b.begin() + 10);
 #else
diff --git a/cpp/src/Slice/CPlusPlusUtil.cpp b/cpp/src/Slice/CPlusPlusUtil.cpp
index da8f51b293a..40400966279 100644
--- a/cpp/src/Slice/CPlusPlusUtil.cpp
+++ b/cpp/src/Slice/CPlusPlusUtil.cpp
@@ -611,21 +611,21 @@ Slice::writeGenericMarshalUnmarshalCode(Output& out, const TypePtr& type, const
 	{
 	    ClassDefPtr def = cl->definition();
 	    string factory;
-	    string type;
+	    string typeName;
 	    if(def && !def->isAbstract())
 	    {
 		factory = fixKwd(cl->scoped());
 		factory += "::ice_factory()";
-		type = fixKwd(cl->scoped());
-		type += "::ice_staticId()";
+		typeName = fixKwd(cl->scoped());
+		typeName += "::ice_staticId()";
 	    }
 	    else
 	    {
 		factory = "0";
-		type = "\"\"";
+		typeName = "\"\"";
 	    }
 	    out << nl << scope << "__" << streamFunc << "Object(" << stream << ", " << tagName << ", "
-		<< type << ", " << factory << ", " << fixedParam << ");";
+		<< typeName << ", " << factory << ", " << fixedParam << ");";
 	}
 	out << eb;
 
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index 97aebb857a4..1dba1dc60ae 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -2436,7 +2436,6 @@ Slice::Gen::ObjectVisitor::visitClassDefEnd(const ClassDefPtr& p)
     else
     {
 	string name = fixKwd(p->name());
-	string scope = fixKwd(p->scope());
 
 	H << sp << nl << "void " << _dllExport << "__patch__" << name << "Ptr(void*, ::Ice::ObjectPtr&);";
 
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp
index 671e852fa03..1fb6fa51a63 100644
--- a/cpp/src/slice2java/Gen.cpp
+++ b/cpp/src/slice2java/Gen.cpp
@@ -1355,7 +1355,7 @@ Slice::Gen::TypesVisitor::visitClassDefStart(const ClassDefPtr& p)
 	out << nl << "__is.startReadSlice();";
         iter = 0;
 	DataMemberList classMembers = p->classDataMembers();
-	int classMemberCount = allClassMembers.size() - classMembers.size();
+	long classMemberCount = allClassMembers.size() - classMembers.size();
         for(d = members.begin(); d != members.end(); ++d)
         {
             list<string> metaData = (*d)->getMetaData();
@@ -1573,7 +1573,7 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
 	out << nl << "__is.startReadSlice();";
         iter = 0;
 	DataMemberList classMembers = p->classDataMembers();
-	int classMemberCount = allClassMembers.size() - classMembers.size();
+	long classMemberCount = allClassMembers.size() - classMembers.size();
         for(d = members.begin(); d != members.end(); ++d)
         {
 	    ostringstream patchParams;
@@ -2969,8 +2969,8 @@ Slice::Gen::HelperVisitor::visitDictionary(const DictionaryPtr& p)
             else
             {
                 string s = typeToString(type, TypeModeIn, scope);
-		BuiltinPtr builtin = BuiltinPtr::dynamicCast(type);
-		if((builtin && builtin->kind() == Builtin::KindObject) || ClassDeclPtr::dynamicCast(type))
+		BuiltinPtr builtin2 = BuiltinPtr::dynamicCast(type);
+		if((builtin2 && builtin2->kind() == Builtin::KindObject) || ClassDeclPtr::dynamicCast(type))
 		{
 		    writeMarshalUnmarshalCode(out, scope, type, arg, false, iter, false, list<string>(),
 					      "__r, __key");