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

Unified Diff: build/common.gypi

Issue 3705002: Roll gtest 445 -> 446 (Closed)
Patch Set: clang Created 10 years, 2 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 | « DEPS ('k') | chrome_frame/test/exception_barrier_unittest.cc » ('j') | 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 d02856535d15b8b71fe10c9df73ef11f17f30cca..3f37e4e3d48f0806de62d821f6820c7507cbcddc 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1143,6 +1143,10 @@
'-Wno-bool-conversions',
# Don't die on dtoa code that uses a char as an array index.
'-Wno-char-subscripts',
+ # Survive EXPECT_EQ(unnamed_enum, unsigned int) -- see
+ # http://code.google.com/p/googletest/source/detail?r=446 .
+ # TODO(thakis): Use -isystem instead (http://crbug.com/58751 ).
+ '-Wno-unnamed-type-template-args',
],
'cflags!': [
# Clang doesn't seem to know know this flag.
@@ -1251,6 +1255,10 @@
# Don't die on dtoa code that uses a char as an array index.
# This is required solely for base/third_party/dmg_fp/dtoa.cc.
'-Wno-char-subscripts',
+ # Survive EXPECT_EQ(unnamed_enum, unsigned int) -- see
+ # http://code.google.com/p/googletest/source/detail?r=446 .
+ # TODO(thakis): Use -isystem instead (http://crbug.com/58751 ).
+ '-Wno-unnamed-type-template-args',
],
}],
],
« no previous file with comments | « DEPS ('k') | chrome_frame/test/exception_barrier_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698