Changeset 66832 in vbox for trunk/src/VBox

Timestamp:

May 8, 2017 4:59:13 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

115280

Message:

Main: Adjustments for Visual C++ v12 / Visual Studio 2013. New warnings.

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (1 diff)
• cbinding/capiidl.xsl (modified) (1 diff)
• webservice/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Main/Makefile.kmk

@@ -1304 +1304 @@
                 '#pragma warning(push) /* -Wall and windows.h */' \
                 '#pragma warning(disable:4668 4255)' \
+                '#if _MSC_VER >= 1800 /* RT_MSC_VER_VC120 */' \
+                '# pragma warning(disable:4005)' \
+                '#endif' \
                ''
         $(QUIET)$(CAT_EXT) "$1.tmp" >> "$1"

trunk/src/VBox/Main/cbinding/capiidl.xsl

@@ -98 +98 @@
 # pragma warning(push)
 # pragma warning(disable:4668 4255) /* -Wall and windows.h */
+# if _MSC_VER >= 1800 /*RT_MSC_VER_VC120*/
+#  pragma warning(disable:4005) /* sdk/v7.1/include/sal_supp.h(57) : warning C4005: '__useHeader' : macro redefinition */
+# endif
 # undef COBJMACROS
 # define COBJMACROS

trunk/src/VBox/Main/webservice/Makefile.kmk

@@ -292 +292 @@
    $(VBOX_GSOAP_CXX_SOURCES)_CXXFLAGS.win += -wd4211 # nonstandard extension used: redefined extern to static
    $(VBOX_GSOAP_CXX_SOURCES)_CXXFLAGS.win += -wd4310 # cast truncates constant value
+   if1of ($(VBOX_VCC_TOOL_STEM), VCC120)
+    $(VBOX_GSOAP_CXX_SOURCES)_CXXFLAGS.win += -wd4056 # v2.8.36/stdsoap2.cpp(14008) : warning C4056: overflow in floating-point constant arithmetic
+    $(VBOX_GSOAP_CXX_SOURCES)_CXXFLAGS.win += -wd4756 # v2.8.36/stdsoap2.cpp(14008) : warning C4756: overflow in constant arithmetic
+   endif
   endif