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

[Stephan Bergmann (via logerrit)]

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

New commits:
commit aca847cf1283e242c2d1106309ad4bb73d8f37a6
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Dec 14 16:12:24 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Mon Dec 14 17:28:54 2020 +0100

    -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 at redhat.com>

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