Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2784)

Unified Diff: build/common.gypi

Issue 943893003: win vs2015: disable some warnings in non-chromium code, change magic maxilksize (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 1266286fb21062ccd14655de31415bc48665017f..64744c6a0e095ae189c5eab9af7d4a0aae9980f3 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -3034,7 +3034,14 @@
'_CRT_NONSTDC_NO_DEPRECATE',
'_SCL_SECURE_NO_DEPRECATE',
],
- 'msvs_disabled_warnings': [4800],
+ 'msvs_disabled_warnings': [
+ # These are variable shadowing warnings that are new in VS2015.
+ # We should probably work through these at some point for
+ # non-chromium code, but for now, focus on chromium_code==1 code.
+ 4456, 4457, 4458, 4459,
+
+ 4800,
+ ],
'msvs_settings': {
'VCCLCompilerTool': {
'WarningLevel': '3',
@@ -3156,7 +3163,8 @@
# Suggested by Microsoft Devrel to avoid
# LINK : fatal error LNK1248: image size (80000000) exceeds maximum allowable size (80000000)
# which started happening more regularly after VS2013 Update 4.
- '/maxilksize:2147483647',
+ # Needs to be a bit lower for VS2015, or else errors out.
+ '/maxilksize:0x7ff00000',
brucedawson 2015/02/20 18:09:03 Good. I hit the same error in some VS 2013 context
],
},
},
@@ -5389,6 +5397,11 @@
],
'msvs_cygwin_shell': 0,
'msvs_disabled_warnings': [
+ # C4091: 'typedef ': ignored on left of 'X' when no variable is
+ # declared.
+ # This happens in a number of Windows headers. Dumb.
+ 4091,
+
# C4127: conditional expression is constant
# This warning can in theory catch dead code and other problems, but
# triggers in far too many desirable cases where the conditional
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698