4 files changed, 12 insertions, 3 deletions
diff --git a/cpp/src/FreezeScript/DumpDB.cpp b/cpp/src/FreezeScript/DumpDB.cpp
index 0a99da28a25..f5ab1653de3 100644..100755
--- a/cpp/src/FreezeScript/DumpDB.cpp
+++ b/cpp/src/FreezeScript/DumpDB.cpp
@@ -439,7 +439,7 @@ run(const Ice::StringSeq& originalArgs, const Ice::CommunicatorPtr& communicator
         while(true)
         {
             in.read(buff, 1024);
-            descriptors.append(buff, in.gcount());
+            descriptors.append(buff, static_cast<size_t>(in.gcount()));
             if(in.gcount() < 1024)
             {
                 break;
diff --git a/cpp/src/FreezeScript/TransformVisitor.cpp b/cpp/src/FreezeScript/TransformVisitor.cpp
index e0ba143e66b..ad47f9ca2a8 100644..100755
--- a/cpp/src/FreezeScript/TransformVisitor.cpp
+++ b/cpp/src/FreezeScript/TransformVisitor.cpp
@@ -527,7 +527,12 @@ FreezeScript::TransformVisitor::transformObject(const ObjectDataPtr& dest, const
     catch(...)
     {
         objectDataMap.erase(p);
+
+#if (defined(_MSC_VER) && (_MSC_VER >= 1600))
+	objectDataMap.insert(ObjectDataMap::value_type(src.get(), nullptr));
+#else
         objectDataMap.insert(ObjectDataMap::value_type(src.get(), 0));
+#endif
         throw;
     }
 }
diff --git a/cpp/src/FreezeScript/Transformer.cpp b/cpp/src/FreezeScript/Transformer.cpp
index adb1601c5de..b509c1a0045 100644..100755
--- a/cpp/src/FreezeScript/Transformer.cpp
+++ b/cpp/src/FreezeScript/Transformer.cpp
@@ -2649,7 +2649,11 @@ FreezeScript::ObjectVisitor::visitObject(const ObjectRefPtr& data)
         ObjectDataMap::iterator p = _map.find(value.get());
         if(p == _map.end())
         {
-            _map.insert(ObjectDataMap::value_type(value.get(), 0));
+#if (defined(_MSC_VER) && (_MSC_VER >= 1600))
+            _map.insert(ObjectDataMap::value_type(value.get(), nullptr));
+#else
+	    _map.insert(ObjectDataMap::value_type(value.get(), 0));
+#endif
             DataMemberMap& members = value->getMembers();
             for(DataMemberMap::iterator q = members.begin(); q != members.end(); ++q)
             {
diff --git a/cpp/src/FreezeScript/transformdb.cpp b/cpp/src/FreezeScript/transformdb.cpp
index 1e9dc8e5eea..9d5afb3f8b9 100644..100755
--- a/cpp/src/FreezeScript/transformdb.cpp
+++ b/cpp/src/FreezeScript/transformdb.cpp
@@ -686,7 +686,7 @@ run(const Ice::StringSeq& originalArgs, const Ice::CommunicatorPtr& communicator
         while(true)
         {
             in.read(buff, 1024);
-            descriptors.append(buff, in.gcount());
+            descriptors.append(buff, static_cast<size_t>(in.gcount()));
             if(in.gcount() < 1024)
             {
                 break;