odk/settings/settings.mk | 4 ++-- solenv/gbuild/platform/windows.mk | 4 ++-- solenv/inc/set_wntx64.mk | 2 +- solenv/inc/wntmsci11.mk | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-)
New commits: commit 197b1ac3007b870e6c51ae9c767ad4f2a340e799 Author: Herbert Dürr <[email protected]> Date: Wed Jul 17 11:55:51 2013 +0000 #i122767# disallow pre-standard C++ for-scope diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index b507e32..b3f0c43 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -99,8 +99,8 @@ EMPTYSTRING= PATH_SEPARATOR=; # use this for release version -CC_FLAGS_JNI=-c -MT -Zm500 -Zc:forScope,wchar_t- -wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800 -Zc:forScope -GR -EHa -CC_FLAGS=-c -MT -Zm500 -Zc:forScope,wchar_t- -wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800 -Zc:forScope -GR -EHa +CC_FLAGS_JNI=-c -MT -Zm500 -Zc:wchar_t- -wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800 -GR -EHa +CC_FLAGS=-c -MT -Zm500 -Zc:wchar_t- -wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800 -GR -EHa ifeq "$(CPP_MANIFEST)" "true" #CC_FLAGS+=-EHa -Zc:wchar_t- LINK_MANIFEST=mt -manifest [email protected] "-outputresource:$@;2" diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index cbb90be..b9dd25f 100644 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -115,7 +115,7 @@ gb_CFLAGS := \ -wd4800 \ -wd4820 \ -wd4826 \ - -Zc:forScope,wchar_t- \ + -Zc:wchar_t- \ -Zm500 \ gb_CXXFLAGS := \ @@ -161,7 +161,7 @@ gb_CXXFLAGS := \ -wd4800 \ -wd4820 \ -wd4826 \ - -Zc:forScope,wchar_t- \ + -Zc:wchar_t- \ -Zm500 \ gb_STDLIBS := \ diff --git a/solenv/inc/set_wntx64.mk b/solenv/inc/set_wntx64.mk index 333ebe9..631a24b 100644 --- a/solenv/inc/set_wntx64.mk +++ b/solenv/inc/set_wntx64.mk @@ -37,7 +37,7 @@ LINK_X64*:=$(WRAPCMD) $(LINK_X64_BINARY) $(NOLOGO) -MACHINE:X64 LIBMGR_X64=$(WRAPCMD) $(LIBMGR_X64_BINARY) $(NOLOGO) IMPLIB_X64=$(WRAPCMD) $(LIBMGR_X64_BINARY) -USE_CFLAGS_X64=-c -nologo -Gs $(NOLOGO) -Zm500 -Zc:forScope,wchar_t- -GR +USE_CFLAGS_X64=-c -nologo -Gs $(NOLOGO) -Zm500 -Zc:wchar_t- -GR # Stack buffer overrun detection. CFLAGS+=-GS diff --git a/solenv/inc/wntmsci11.mk b/solenv/inc/wntmsci11.mk index 93c8222..7270adf 100644 --- a/solenv/inc/wntmsci11.mk +++ b/solenv/inc/wntmsci11.mk @@ -77,7 +77,7 @@ COMPILE_ECHO_FILE= # disable "warning C4675: resolved overload was found by argument-dependent # lookup": # -wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800 -CFLAGS+=-Zm500 -Zc:forScope,wchar_t- -GR +CFLAGS+=-Zm500 -Zc:wchar_t- -GR # Stack buffer overrun detection. CFLAGS+=-GS
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
