summaryrefslogtreecommitdiff
path: root/solenv/gbuild
diff options
context:
space:
mode:
authorThorsten Behrens <Thorsten.Behrens@CIB.de>2018-07-16 01:32:56 +0200
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2018-07-16 01:46:13 +0200
commit232622051966faa116e7093d5c0df26e44cddb43 (patch)
tree3ea6cb4c9468357c3a689a78a5ff5a8f6a6d441d /solenv/gbuild
parentbe138f674c6d96beecf4accf228fd031c9079718 (diff)
Fix Win32 warning C4702: unreachable code
..by disabling the warning for the moment. This happens on x86 builds with VS2017, but only with OSL_DEBUG_LEVEL=0, e.g. at: cppuhelper/source/servicemanager.cxx(1311) : error C2220: warning treated as error - no ´object´ file generated cppuhelper/source/servicemanager.cxx(1311) : warning C4702: unreachable code cppuhelper/source/servicemanager.cxx(1373) : warning C4702: unreachable code Change-Id: I91943350d7f6f5acfedb3b2bb14e5d835e4494ed Reviewed-on: https://gerrit.libreoffice.org/57472 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'solenv/gbuild')
-rw-r--r--solenv/gbuild/platform/WNT_INTEL_MSC.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 704c7f7817dc..72679c5a0e30 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -22,6 +22,9 @@ gb_CPUDEFS := -D_X86_=1
include $(GBUILDDIR)/platform/com_MSC_defs.mk
+gb_CXXFLAGS += \
+ $(if $(filter 0,$(gb_DEBUGLEVEL)),-wd4702) \
+
include $(GBUILDDIR)/platform/com_MSC_class.mk
# vim: set noet sw=4: