[Libreoffice-commits] core.git: solenv/gbuild
Norbert Thiebaud
nthiebaud at gmail.com
Sat Mar 5 18:20:51 UTC 2016
solenv/gbuild/platform/com_MSC_defs.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 7b59e5e22f379782cd94f9bf9f25d8c12f0008f9
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Mar 5 11:33:18 2016 -0600
vs2015 spam C4267 even in 32 bits mode, silence it for now.
Change-Id: I55ba6e9c51a5bbfc366a36e8e0baef9cf05d5bbc
Reviewed-on: https://gerrit.libreoffice.org/22933
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk
index 5a3c043..93994e9 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -164,7 +164,7 @@ gb_CFLAGS := \
-wd4706 \
-wd4800 \
-Zc:wchar_t- \
- $(if $(filter-out 120,$(VCVER)), -Wv:18) \
+ $(if $(filter-out 120,$(VCVER)), -Wv:18 -wd4267) \
ifeq ($(COM_IS_CLANG),TRUE)
gb_CFLAGS += \
@@ -207,7 +207,7 @@ gb_CXXFLAGS := \
-wd4800 \
-wd4913 \
-Zc:wchar_t- \
- $(if $(filter-out 120,$(VCVER)), -Wv:18) \
+ $(if $(filter-out 120,$(VCVER)), -Wv:18 -wd4267) \
ifeq ($(CPUNAME),X86_64)
More information about the Libreoffice-commits
mailing list