diff options
| author | Herbert Dürr <hdu@apache.org> | 2013-07-17 11:55:51 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-07-18 09:13:38 +0100 |
| commit | 1ff69ad5524017914904fd572f1c4b860be81971 (patch) | |
| tree | 2edfb3e9b2118a44a3e15395c118782e7381aeae /solenv | |
| parent | 0218b0e2fa510d7acd7413dbedefd9ad50257f76 (diff) | |
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
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_defs.mk | 4 |
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 04748ed0892b..bb0a141a53bc 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),) |