1 files changed, 10 insertions, 0 deletions
diff --git a/cpp/include/Ice/IncomingAsync.h b/cpp/include/Ice/IncomingAsync.h
index 171b0d188e3..b03ca52b58f 100644
--- a/cpp/include/Ice/IncomingAsync.h
+++ b/cpp/include/Ice/IncomingAsync.h
@@ -45,6 +45,12 @@ public:
 namespace IceInternal
 {
 
+// TODO: fix this warning
+#if defined(_MSC_VER) && (_MSC_VER >= 1900)
+#   pragma warning(push)
+#   pragma warning(disable:4239)
+#endif
+
 //
 // We need virtual inheritance from AMDCallback, because we use multiple
 // inheritance from Ice::AMDCallback for generated AMD code.
@@ -118,6 +124,10 @@ private:
     const ResponseHandlerPtr _responseHandlerCopy;
 };
 
+#if defined(_MSC_VER) && (_MSC_VER >= 1900)
+#   pragma warning(pop)
+#endif
+
 }
 
 #ifndef ICE_CPP11_MAPPING