summaryrefslogtreecommitdiffstats
path: root/build/common.gypi
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-24 02:35:26 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-24 02:35:26 +0000
commit0a42e9008d60db1c2c35d7055bc6890e4f51b6d5 (patch)
tree33936d32a463f338a431342c947a3f1f7b5d9bb2 /build/common.gypi
parent222d547268b605d2d52b0ae952c377d816337ab8 (diff)
downloadchromium_src-0a42e9008d60db1c2c35d7055bc6890e4f51b6d5.zip
chromium_src-0a42e9008d60db1c2c35d7055bc6890e4f51b6d5.tar.gz
chromium_src-0a42e9008d60db1c2c35d7055bc6890e4f51b6d5.tar.bz2
Enable "unreachable code" warning for MSVC.
BUG=346399 TEST=none Review URL: https://codereview.chromium.org/260903003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272687 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/common.gypi')
-rw-r--r--build/common.gypi12
1 files changed, 9 insertions, 3 deletions
diff --git a/build/common.gypi b/build/common.gypi
index 01722a1..e081a2f 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -4947,6 +4947,12 @@
},
},
},
+ # https://code.google.com/p/chromium/issues/detail?id=372451#c20
+ # Warning 4702 ("Unreachable code") should be re-enabled once
+ # Express users are updated to VS2013 Update 2.
+ 'msvs_disabled_warnings': [
+ 4702
+ ],
'msvs_settings': {
'VCLinkerTool': {
# Explicitly required when using the ATL with express
@@ -4974,12 +4980,12 @@
'$(VSInstallDir)/VC/atlmfc/include',
],
'msvs_cygwin_shell': 0,
- 'msvs_disabled_warnings': [4351, 4355, 4396, 4503, 4819,
+ 'msvs_disabled_warnings': [
+ 4351, 4355, 4396, 4503, 4819,
# TODO(maruel): These warnings are level 4. They will be slowly
# removed as code is fixed.
4100, 4121, 4125, 4127, 4130, 4131, 4189, 4201, 4238, 4244, 4245,
- 4310, 4428, 4481, 4505, 4510, 4512, 4530, 4610, 4611, 4701, 4702,
- 4706,
+ 4310, 4428, 4481, 4505, 4510, 4512, 4530, 4610, 4611, 4701, 4706,
],
'msvs_settings': {
'VCCLCompilerTool': {