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

[Michael Stahl]

 solenv/gbuild/platform/com_MSC_defs.mk |   20 --------------------
 1 file changed, 20 deletions(-)

New commits:
commit 75953d43ae38af33bdc79472ff39b9e3619779b4
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Jan 12 15:40:06 2016 +0100

    gbuild: let's hope this MSVC2012 specific hack is unnecessary now
    
    ... at least for dbulo.dll there are no such warnings.
    
    Change-Id: Ib0c77e71ba5737ecd3e2f6812c3cf03010b7eff9

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk
index 88d8695..fab181d 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -197,26 +197,6 @@ gb_CXXFLAGS := \
 	-Zc:wchar_t- \
 
 
-ifneq ($(ENABLE_LTO),)
-
-# Sigh, but there are cases of C4702 when using link-time code
-# generation and optimization where I couldn't get
-# __pragma(warning(disable:4702)) to help. Especially, the
-# ImplInheritanceHelper2() {} in <cppuhelper/implbase2.hxx>
-# was reported as containing "unreachable code" when linking
-# the dbaccess dbu library. Let's try globally disabling C4702.
-
-# Might be fixed in VS2013 though?
-# VCVER=110 for VS2012
-
-ifneq ($(filter 110,$(VCVER)),)
-gb_CXXFLAGS += \
-	-wd4702 \
-
-endif
-
-endif
-
 ifeq ($(CPUNAME),X86_64)
 
 gb_CXXFLAGS += \