diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-10 22:42:47 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-10 22:42:47 +0000 |
| commit | cf8873f23d03d6478ac2ca2364d857122fd062e8 (patch) | |
| tree | 966aad292b1b2a811a2089013822eadad3d05a06 /build | |
| parent | ca2da0c001fbb7120fdb04e32241e4e1a252ff19 (diff) | |
| download | chromium_src-cf8873f23d03d6478ac2ca2364d857122fd062e8.zip chromium_src-cf8873f23d03d6478ac2ca2364d857122fd062e8.tar.gz chromium_src-cf8873f23d03d6478ac2ca2364d857122fd062e8.tar.bz2 | |
roll gtest 560:613, gmock 364:405
Most of the included changes are minor. After this roll, we
have what went into the 1.6 release, and gmock now supports
being build as a DLL. (I want this roll for one of the minor
changes, which makes it possible to reenable
-Wnull-dereference for clang)
Turn -Wnull-dereference back on, fix one instance where a
violation snuck in.
BUG=111806
TEST=none
TBR=tony
Review URL: https://chromiumcodereview.appspot.com/9999025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131656 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/build/common.gypi b/build/common.gypi index 8ed6796..9dec996 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -2083,11 +2083,6 @@ # Warns on switches on enums that cover all enum values but # also contain a default: branch. Chrome is full of that. '-Wno-covered-switch-default', - - # TODO(thakis): Reenable once this no longer complains about - # Invalid() in gmocks's gmock-internal-utils.h - # http://crbug.com/111806 - '-Wno-null-dereference', ], 'cflags!': [ # Clang doesn't seem to know know this flag. @@ -2502,11 +2497,6 @@ # Warns on switches on enums that cover all enum values but # also contain a default: branch. Chrome is full of that. '-Wno-covered-switch-default', - - # TODO(thakis): Reenable once this no longer complains about - # Invalid() in gmock's gmock-internal-utils.h - # http://crbug.com/111806 - '-Wno-null-dereference', ], }], ['clang==1 and clang_use_chrome_plugins==1', { |