[Libreoffice-commits] core.git: solenv/gbuild

[Michael Stahl]

 solenv/gbuild/platform/com_MSC_defs.mk |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit a8c503a69c467526ef80ec36b7916e7b931f9101
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Aug 13 15:37:28 2014 +0200

    gbuild: MSVC: disable warning C4373 again
    
    Making our code acceptable for ancient compilers that we don't use and
    that don't actually support C++ is a complete waste of time.
    
    (partially reverts 856b7f5f783471388cd811d92172cc1d2da7e331)
    
    Change-Id: I26a1a67d8c4beb31d6c0c301a56a948552683422

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk
index 1526172..380b2c5 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -96,6 +96,12 @@ gb_AFLAGS := $(AFLAGS)
 
 # C4355: 'this' : used in base member initializer list
 
+# C4373: '%$S': virtual function overrides '%$pS', previous versions
+#   of the compiler did not override when parameters only differed by
+#   const/volatile qualifiers.
+# [translation: ancient compilers that don't actually support C++ do
+#  stupid things]
+
 # C4481: nonstandard extension used: override specifier 'override'
 # (MSVC 2010 warns about this, even though it's C++11 keyword)
 
@@ -161,6 +167,7 @@ gb_CXXFLAGS := \
 	-wd4290 \
 	-wd4351 \
 	-wd4355 \
+	-wd4373 \
 	-wd4481 \
 	-wd4505 \
 	-wd4512 \