summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2020-12-14 16:12:24 +0100
committerStephan Bergmann <sbergman@redhat.com>2020-12-14 17:28:54 +0100
commitaca847cf1283e242c2d1106309ad4bb73d8f37a6 (patch)
tree9603e26c2b31e4ab023fa5bc56aa7a0ebaaae3d4 /solenv
parentc98f43fc0e17c576a64840bb61770094f8be12ce (diff)
-wd4505 is still needed
...see e.g. <https://ci.libreoffice.org//job/lo_tb_master_win/29066> > C:/cygwin/home/tdf/lode/jenkins/workspace/lo_tb_master_win/unotools/source/config/bootstrap.cxx(269): error C2220: the following warning is treated as an error > C:/cygwin/home/tdf/lode/jenkins/workspace/lo_tb_master_win/unotools/source/config/bootstrap.cxx(269): warning C4505: 'utl::dbgCheckStatusOfURL': unreferenced local function has been removed where the OSL_ASSERT used in > OSL_ASSERT(aStatus != Bootstrap::PATH_VALID || dbgCheckStatusOfURL(sDerivedURL) == Bootstrap::PATH_VALID); is defined in terms of SAL_DETAIL_WARN_IF_FORMAT, which in turn is careful to make its contents visible to the compiler even under --disable-sal-log. That MSVC warning, about a function whose only reference is in code that the compiler can statically determine to be unreachable, is really unhelpful. This partially reverts 5c082fc1b59022252d90423afde174123976cdee "remove some MSVC -wd". Change-Id: Ie337989ee0ca6b7d7f29a50026fa249b0b266474 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107716 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/platform/com_MSC_defs.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk
index aee3fbb38c8b..2c92585235c9 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -93,6 +93,8 @@ gb_AFLAGS := $(AFLAGS)
# C4275: non-DLL-interface classkey 'identifier' used as base for
# DLL-interface classkey 'identifier'
+# C4505: 'function' : unreferenced local function has been removed
+
# C4611: interaction between 'function' and C++ object destruction is
# non-portable
@@ -110,6 +112,7 @@ gb_CFLAGS := \
-nologo \
-W4 \
-wd4244 \
+ -wd4505 \
gb_CXXFLAGS_DISABLE_WARNINGS = -w