diff options
author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-10 21:00:09 +0000 |
---|---|---|
committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-10 21:00:09 +0000 |
commit | 219c503bb3c190bf3dfcf902d1de38ae9a8b0a71 (patch) | |
tree | 3693950b898cca64a4641c6066f883dce79bb149 /third_party | |
parent | 30bab639d6cb206b68a2995cf1ec9f750ce9de73 (diff) | |
download | chromium_src-219c503bb3c190bf3dfcf902d1de38ae9a8b0a71.zip chromium_src-219c503bb3c190bf3dfcf902d1de38ae9a8b0a71.tar.gz chromium_src-219c503bb3c190bf3dfcf902d1de38ae9a8b0a71.tar.bz2 |
disable c4267 in cld for building on win x64
TBR=jschuh@chromium.org
BUG=167187
Review URL: https://chromiumcodereview.appspot.com/11783096
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176150 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rw-r--r-- | third_party/cld/cld.gyp | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/third_party/cld/cld.gyp b/third_party/cld/cld.gyp index b2db4c7..4813f48 100644 --- a/third_party/cld/cld.gyp +++ b/third_party/cld/cld.gyp @@ -101,22 +101,20 @@ }, 'conditions': [ ['OS=="win"', { - 'direct_dependent_settings': { - 'defines': [ - 'COMPILER_MSVC', - ], - }, - 'msvs_disabled_warnings': [4005, 4006, 4018, 4244, 4309, 4800], - }, - ], - ['OS!="win"', { - 'direct_dependent_settings': { - 'defines': [ - 'COMPILER_GCC', - ], - }, - }, - ], + 'direct_dependent_settings': { + 'defines': [ + 'COMPILER_MSVC', + ], + }, + # TODO(jschuh): C4267: http://crbug.com/167187 size_t -> int + 'msvs_disabled_warnings': [4005, 4006, 4018, 4244, 4309, 4800, 4267], + }, { + 'direct_dependent_settings': { + 'defines': [ + 'COMPILER_GCC', + ], + }, + }], ], }, ], |