odk/settings/settings.mk | 4 ++--
solenv/gbuild/platform/com_MSC_defs.mk | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 1ff69ad5524017914904fd572f1c4b860be81971
Author: Herbert Dürr <h...@apache.org>
Date: Wed Jul 17 11:55:51 2013 +0000
Resolves: #i122767# disallow pre-standard C++ for-scope
(cherry picked from commit 197b1ac3007b870e6c51ae9c767ad4f2a340e799)
Conflicts:
odk/settings/settings.mk
solenv/gbuild/platform/windows.mk
solenv/inc/set_wntx64.mk
solenv/inc/wntmsci11.mk
Change-Id: I266a0d7672839b4568e76b7223aae15d82cd9a63
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index ffab229..b884e75 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -107,8 +107,8 @@ endif
ifeq "$(DEBUG)" "yes"
OPT_FLAGS=-Zi
endif
-CC_FLAGS_JNI=-c $(LIBO_SDK_DETAIL_CFLAGS_MSVCRT) -Zm500 -Zc:forScope,wchar_t-
-wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800 -Zc:forScope -GR -EHa
$(OPT_FLAGS)
-CC_FLAGS=-c $(LIBO_SDK_DETAIL_CFLAGS_MSVCRT) -Zm500 -Zc:forScope,wchar_t-
-wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800 -Zc:forScope -GR -EHa
$(OPT_FLAGS)
+CC_FLAGS_JNI=-c $(LIBO_SDK_DETAIL_CFLAGS_MSVCRT) -Zm500 -Zc:wchar_t- -wd4251
-wd4275 -wd4290 -wd4675 -wd4786 -wd4800 -GR -EHa $(OPT_FLAGS)
+CC_FLAGS=-c $(LIBO_SDK_DETAIL_CFLAGS_MSVCRT) -Zm500 -Zc:wchar_t- -wd4251
-wd4275 -wd4290 -wd4675 -wd4786 -wd4800 -GR -EHa $(OPT_FLAGS)
ifeq "$(CPP_MANIFEST)" "true"
LINK_MANIFEST=mt -manifest $@.manifest "-outputresource:$@;2"
else
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk
b/solenv/gbuild/platform/com_MSC_defs.mk
index 04748ed..bb0a141 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -145,7 +145,7 @@ gb_CFLAGS := \
-wd4626 \
-wd4706 \
-wd4800 \
- -Zc:forScope,wchar_t- \
+ -Zc:wchar_t- \
-Zm500 \
gb_CXXFLAGS := \
@@ -175,7 +175,7 @@ gb_CXXFLAGS := \
-wd4706 \
-wd4800 \
-wd4913 \
- -Zc:forScope,wchar_t- \
+ -Zc:wchar_t- \
-Zm500 \
ifneq ($(MSVC_USE_DEBUG_RUNTIME),)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
