diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-17 23:34:59 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-17 23:34:59 +0000 |
| commit | 913da51b80bd29f327aa2f32dc8d0ce3e1398ff9 (patch) | |
| tree | 20d7b4f0e4d38c7d9425d53bba2a0c06ff10f7d6 /base/allocator | |
| parent | 333f3812d5e0e205d92818982abb3c3e1111fb0e (diff) | |
| download | chromium_src-913da51b80bd29f327aa2f32dc8d0ce3e1398ff9.zip chromium_src-913da51b80bd29f327aa2f32dc8d0ce3e1398ff9.tar.gz chromium_src-913da51b80bd29f327aa2f32dc8d0ce3e1398ff9.tar.bz2 | |
roll clang 161353:161757
Also suppress two warnings in third_party targets.
gyp changes reviewed by willchan in
http://codereview.chromium.org/10832369/
BUG=141532,138571
TBR=hans,willchan
Review URL: https://chromiumcodereview.appspot.com/10827405
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152187 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/allocator')
| -rw-r--r-- | base/allocator/allocator.gyp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp index f2a6160..b85dd51 100644 --- a/base/allocator/allocator.gyp +++ b/base/allocator/allocator.gyp @@ -436,6 +436,11 @@ # Disable the heap checker in tcmalloc. 'defines': [ 'NO_HEAP_CHECK', + ], + }], + [ 'clang==1', { + 'cflags': [ + '-Wno-non-literal-null-conversion', ], }], ], |