Author: hdu
Date: Wed Jul 17 11:55:51 2013
New Revision: 1504081
URL: http://svn.apache.org/r1504081
Log:
#i122767# disallow pre-standard C++ for-scope
Modified:
openoffice/trunk/main/odk/settings/settings.mk
openoffice/trunk/main/solenv/gbuild/platform/windows.mk
openoffice/trunk/main/solenv/inc/set_wntx64.mk
openoffice/trunk/main/solenv/inc/wntmsci11.mk
Modified: openoffice/trunk/main/odk/settings/settings.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/odk/settings/settings.mk?rev=1504081&r1=1504080&r2=1504081&view=diff
==============================================================================
--- openoffice/trunk/main/odk/settings/settings.mk (original)
+++ openoffice/trunk/main/odk/settings/settings.mk Wed Jul 17 11:55:51 2013
@@ -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 $@.manifest "-outputresource:$@;2"
Modified: openoffice/trunk/main/solenv/gbuild/platform/windows.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/windows.mk?rev=1504081&r1=1504080&r2=1504081&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/windows.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/windows.mk Wed Jul 17 11:55:51
2013
@@ -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 := \
Modified: openoffice/trunk/main/solenv/inc/set_wntx64.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/set_wntx64.mk?rev=1504081&r1=1504080&r2=1504081&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/set_wntx64.mk (original)
+++ openoffice/trunk/main/solenv/inc/set_wntx64.mk Wed Jul 17 11:55:51 2013
@@ -37,7 +37,7 @@ LINK_X64*:=$(WRAPCMD) $(LINK_X64_BINARY)
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
Modified: openoffice/trunk/main/solenv/inc/wntmsci11.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/wntmsci11.mk?rev=1504081&r1=1504080&r2=1504081&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/wntmsci11.mk (original)
+++ openoffice/trunk/main/solenv/inc/wntmsci11.mk Wed Jul 17 11:55:51 2013
@@ -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
