diff options
author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-16 18:39:53 +0000 |
---|---|---|
committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-16 18:39:53 +0000 |
commit | 46ce5b568acd801330e52a4e04534d9689990835 (patch) | |
tree | 86944486c8faf85322981d343013f2de8ecfbb91 /testing/gtest.gyp | |
parent | ac201f961a6c0151dc596829584339c199527ba5 (diff) | |
download | chromium_src-46ce5b568acd801330e52a4e04534d9689990835.zip chromium_src-46ce5b568acd801330e52a4e04534d9689990835.tar.gz chromium_src-46ce5b568acd801330e52a4e04534d9689990835.tar.bz2 |
Revert 49982 - patch
TBR=thakis@chromium.org
Review URL: http://codereview.chromium.org/2825006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50002 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing/gtest.gyp')
-rw-r--r-- | testing/gtest.gyp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/testing/gtest.gyp b/testing/gtest.gyp index 706f11d..c8f64e5 100644 --- a/testing/gtest.gyp +++ b/testing/gtest.gyp @@ -69,12 +69,10 @@ # must be instructed that RTTI is disabled here, and for any # direct dependents that might include gtest headers. 'GTEST_HAS_RTTI=0', - 'GTEST_USE_OWN_TR1_TUPLE=1', ], 'direct_dependent_settings': { 'defines': [ 'GTEST_HAS_RTTI=0', - 'GTEST_USE_OWN_TR1_TUPLE=1', ], }, }], |