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

[Luboš Luňák]

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

New commits:
commit 902a65ffb571fa69853440051765313b805ebad1
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Tue Jun 25 15:47:14 2013 +0200

    now that we detect msvc supports 'override', do not warn about it
    
    Change-Id: I127f6756bae786c41122174b615c607b2c3b7ec4

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk
index 162fd2f..579e6a9 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -101,6 +101,9 @@ gb_AFLAGS := $(AFLAGS)
 #   of the compiler did not override when parameters only differed by
 #   const/volatile qualifiers.
 
+# C4481: nonstandard extension used: override specifier 'override'
+# (MSVC 2010 warns about this, even though it's C++11 keyword)
+
 # C4505: 'function' : unreferenced local function has been removed
 
 # C4512: 'class' : assignment operator could not be generated
@@ -165,6 +168,7 @@ gb_CXXFLAGS := \
 	-wd4351 \
 	-wd4355 \
 	-wd4373 \
+	-wd4481 \
 	-wd4505 \
 	-wd4512 \
 	-wd4611 \