[Libreoffice-commits] .: solenv/gbuild

[Libreoffice Gerrit user]

 solenv/gbuild/platform/com_MSC_defs.mk |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 3e6bc1522fe7ef734f5ed51e4bffea62d96e6707
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Sun Dec 2 11:32:17 2012 +0200

    More -wd fixups

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk
index 8e3f249..b45d47a 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -108,7 +108,7 @@ gb_AFLAGS := /c /Cp
 # C4265: 'class' : class has virtual functions, but destructor is not
 #   virtual
 
-# C4275: non – DLL-interface classkey 'identifier' used as base for
+# C4275: non-DLL-interface classkey 'identifier' used as base for
 #   DLL-interface classkey 'identifier'
 
 # C4290: C++ exception specification ignored except to indicate a
@@ -116,8 +116,6 @@ gb_AFLAGS := /c /Cp
 
 # C4350: behavior change: 'member1' called instead of 'member2'
 
-# C4355: 'this' : used in base member initializer list
-
 # C4351: new behavior: elements of array 'array' will be default
 #   initialized
 
@@ -126,6 +124,10 @@ gb_AFLAGS := /c /Cp
 # C4365: 'action' : conversion from 'type_1' to 'type_2',
 #   signed/unsigned mismatch
 
+# C4373: '%$S': virtual function overrides '%$pS', previous versions
+#   of the compiler did not override when parameters only differed by
+#   const/volatile qualifiers.
+
 # C4503: 'identifier' : decorated name length exceeded, name was
 #   truncated
 
@@ -209,11 +211,9 @@ gb_CFLAGS := \
 	-wd4255 \
 	-wd4275 \
 	-wd4290 \
-	-wd4294 \
 	-wd4350 \
 	-wd4355 \
 	-wd4365 \
-	-wd4373 \
 	-wd4503 \
 	-wd4505 \
 	-wd4511 \
@@ -266,6 +266,7 @@ gb_CXXFLAGS := \
 	-wd4351 \
 	-wd4355 \
 	-wd4365 \
+	-wd4373 \
 	-wd4503 \
 	-wd4505 \
 	-wd4511 \