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

Unified Diff: testing/gtest.gyp

Issue 1981383003: Allow GTest to use C++11 features (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes typo Created 4 years, 7 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: testing/gtest.gyp
diff --git a/testing/gtest.gyp b/testing/gtest.gyp
index 79d7e669800e3a1614df0027537bc52c951a9b0d..0d2f3dd53490982a50013326d22099a39ea86050 100644
--- a/testing/gtest.gyp
+++ b/testing/gtest.gyp
@@ -25,16 +25,25 @@
# In order to allow regex matches in gtest to be shared between Windows
# and other systems, we tell gtest to always use it's internal engine.
'GTEST_HAS_POSIX_RE=0',
- # Chrome doesn't support / require C++11, yet.
- 'GTEST_LANG_CXX11=0',
],
'all_dependent_settings': {
'defines': [
'GTEST_HAS_POSIX_RE=0',
- 'GTEST_LANG_CXX11=0',
],
},
'conditions': [
+ ['OS == "chromeos"', {
+ 'defines': [
+ # ChromeOS uses libstd++4.6, which has an outdated <type_traits>
+ # header that lacks traits required by GTest in C++11 mode.
+ 'GTEST_LANG_CXX11=0',
+ ],
+ 'direct_dependency_settings': {
+ 'defines': [
+ 'GTEST_LANG_CXX11=0',
+ ],
+ },
+ }],
['OS == "mac" or OS == "ios"', {
'sources': [
'gtest_mac.h',
« 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