include/sal/types.h | 3 ++-
solenv/gbuild/platform/com_MSC_defs.mk | 4 ++++
2 files changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 7731f62c25e5a32043b783af2e6f7aa9afe2e26a
Author: Tor Lillqvist <t...@collabora.com>
Date: Thu Aug 14 13:58:31 2014 +0300
If we disable C4189 we should also disable C4100
They are both bogusly emitted from SAL_WARN_IF in an optimizing
compilation.
Change-Id: Ia56687422a29c61a7a8ad0d48541300c7643120e
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk
b/solenv/gbuild/platform/com_MSC_defs.mk
index 0911a07..0fbc69e 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -68,6 +68,8 @@ gb_AFLAGS := $(AFLAGS)
# cleaning away from the code, to avoid warnings when building with
# gcc or Clang and -Wall -Werror.
+# C4100: 'identifier' : unreferenced format parameter
+
# C4127: conditional expression is constant
# C4189: 'identifier' : local variable is initialized but not referenced
@@ -138,6 +140,7 @@ gb_CFLAGS := \
$(if $(MSVC_USE_DEBUG_RUNTIME),-MDd,-MD) \
-nologo \
-W4 \
+ $(if $(filter 0,$(gb_DEBUGLEVEL)),-wd4100) \
-wd4127 \
$(if $(filter 0,$(gb_DEBUGLEVEL)),-wd4189) \
-wd4242 \
@@ -161,6 +164,7 @@ gb_CXXFLAGS := \
$(if $(MSVC_USE_DEBUG_RUNTIME),-MDd,-MD) \
-nologo \
-W4 \
+ $(if $(filter 0,$(gb_DEBUGLEVEL)),-wd4100) \
-wd4127 \
$(if $(filter 0,$(gb_DEBUGLEVEL)),-wd4189) \
-wd4201 \
commit b1744526cc35531f5cb561137082ea8f725be43a
Author: Tor Lillqvist <t...@collabora.com>
Date: Thu Aug 14 13:34:15 2014 +0300
WaE: C4722: destructor never returns, potential memory leak
Change-Id: I9691048ca7dc6e18cc904b29e8f6f59b11e002cf
diff --git a/include/sal/types.h b/include/sal/types.h
index 86c31c2..af98c87 100644
--- a/include/sal/types.h
+++ b/include/sal/types.h
@@ -527,7 +527,8 @@ template< typename T1, typename T2 > inline T1
static_int_cast(T2 n) {
#ifdef _MSC_VER
#define SAL_WNOUNREACHABLE_CODE_PUSH \
__pragma(warning(push)) \
- __pragma(warning(disable:4702))
+ __pragma(warning(disable:4702)) \
+ __pragma(warning(disable:4722))
#define SAL_WNOUNREACHABLE_CODE_POP \
__pragma(warning(pop))
#else
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
