summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2016-03-05 11:33:18 -0600
committerNorbert Thiebaud <nthiebaud@gmail.com>2016-03-05 18:20:28 +0000
commit7b59e5e22f379782cd94f9bf9f25d8c12f0008f9 (patch)
tree5d7c3415a2f58cb703eaedc899bac768e1140bfb /solenv
parentc189b032236498e93cbc79c63617303aa1ba81eb (diff)
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@libreoffice.org> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/platform/com_MSC_defs.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk
index 5a3c0433779d..93994e998718 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)