[Libreoffice-commits] core.git: solenv/gbuild
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Mon Dec 14 06:48:45 UTC 2020
solenv/gbuild/platform/com_MSC_defs.mk | 59 ---------------------------------
1 file changed, 59 deletions(-)
New commits:
commit 5c082fc1b59022252d90423afde174123976cdee
Author: Noel Grandin <noel at peralex.com>
AuthorDate: Wed Dec 9 14:55:19 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Dec 14 07:48:07 2020 +0100
remove some MSVC -wd
which appear to no longer be necessary on master with our updated
MSVC requirements.
Change-Id: I55a0267bfc5e2c36d9da7b9b7281b54e9f770f01
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107470
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk
index 892faf76931b..89eee1b9f04b 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -76,16 +76,8 @@ gb_AFLAGS := $(AFLAGS)
# cleaning away from the code, to avoid warnings when building with
# gcc or Clang and -Wall -Werror.
-# C4091: 'typedef ': ignored on left of '' when no variable is declared
-
-# C4100: 'identifier' : unreferenced formal parameter
-
# C4127: conditional expression is constant
-# C4189: 'identifier' : local variable is initialized but not referenced
-
-# C4200: nonstandard extension used : zero-sized array in struct/union
-
# C4201: nonstandard extension used : nameless struct/union
# C4244: nonstandard extension used : formal parameter 'identifier'
@@ -101,28 +93,6 @@ gb_AFLAGS := $(AFLAGS)
# C4275: non-DLL-interface classkey 'identifier' used as base for
# DLL-interface classkey 'identifier'
-# C4290: C++ exception specification ignored except to indicate a
-# function is not __declspec(nothrow)
-
-# C4351: new behavior: elements of array 'array' will be default
-# initialized
-# (an issue with MSVC 2013 that appears to be gone with MSVC 2015)
-
-# C4373: '%$S': virtual function overrides '%$pS', previous versions
-# of the compiler did not override when parameters only differed by
-# const/volatile qualifiers.
-# [translation: ancient compilers that don't actually support C++ do
-# stupid things]
-
-# C4505: 'function' : unreferenced local function has been removed
-
-# C4510: 'class' : default constructor could not be generated
-
-# C4512: 'class' : assignment operator could not be generated
-# (an issue with MSVC 2013 that appears to be gone with MSVC 2015)
-
-# C4610: 'class' can never be instantiated - user defined constructor required
-
# C4611: interaction between 'function' and C++ object destruction is
# non-portable
@@ -130,9 +100,6 @@ gb_AFLAGS := $(AFLAGS)
# C4706: assignment within conditional expression
-# C4800: 'type' : forcing value to bool 'true' or 'false' (performance
-# warning)
-
gb_CFLAGS := \
-utf-8 \
-Gd \
@@ -142,18 +109,7 @@ gb_CFLAGS := \
$(if $(MSVC_USE_DEBUG_RUNTIME),-MDd,-MD) \
-nologo \
-W4 \
- -wd4091 \
- $(if $(filter 0,$(gb_DEBUGLEVEL)),-wd4100) \
- -wd4127 \
- $(if $(filter 0,$(gb_DEBUGLEVEL)),-wd4189) \
- -wd4200 \
-wd4244 \
- -wd4251 \
- -wd4505 \
- -wd4512 \
- -wd4706 \
- -wd4800 \
- -wd4267 \
gb_CXXFLAGS_DISABLE_WARNINGS = -w
@@ -176,26 +132,15 @@ gb_CXXFLAGS := \
$(if $(MSVC_USE_DEBUG_RUNTIME),-MDd,-MD) \
-nologo \
-W4 \
- -wd4091 \
- $(if $(filter 0,$(gb_DEBUGLEVEL)),-wd4100) \
-wd4127 \
- $(if $(filter 0,$(gb_DEBUGLEVEL)),-wd4189) \
-wd4201 \
-wd4244 \
-wd4250 \
-wd4251 \
-wd4267 \
-wd4275 \
- -wd4290 \
- -wd4351 \
- -wd4373 \
- -wd4505 \
- -wd4510 \
- -wd4512 \
- -wd4610 \
-wd4611 \
-wd4706 \
- -wd4800 \
ifeq ($(CPUNAME),INTEL)
@@ -210,12 +155,8 @@ endif
ifneq ($(COM_IS_CLANG),TRUE)
# clang-cl doesn't support -Wv:18 for now
-# Work around MSVC 2017 C4702 compiler bug with release builds
-# http://document-foundation-mail-archive.969070.n3.nabble.com/Windows-32-bit-build-failure-unreachable-code-tp4243848.html
-# http://document-foundation-mail-archive.969070.n3.nabble.com/64-bit-Windows-build-failure-after-MSVC-Update-tp4246816.html
gb_CXXFLAGS += \
-Wv:18 \
- $(if $(filter 0,$(gb_DEBUGLEVEL)),-wd4702) \
endif
More information about the Libreoffice-commits
mailing list