summaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-11 16:37:44 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-11 16:37:44 +0000
commit853c781de76a336824634893a7a9c3eee91cd6ff (patch)
tree6eb5e3e1fb2b4656f38bb33a8a3ba5c61b81074a /testing
parentd72a14fb905a315395b0df8b007c9e13c3671b16 (diff)
downloadchromium_src-853c781de76a336824634893a7a9c3eee91cd6ff.zip
chromium_src-853c781de76a336824634893a7a9c3eee91cd6ff.tar.gz
chromium_src-853c781de76a336824634893a7a9c3eee91cd6ff.tar.bz2
clang: Remove another unnecessary workaround
Older clangs failed to parse tr1::tuple and used gtest's implementation thereof. That's no longer necessary. BUG=none Review URL: https://chromiumcodereview.appspot.com/10907172 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156024 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing')
-rw-r--r--testing/gtest.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/testing/gtest.gyp b/testing/gtest.gyp
index 4fa71dd..bd54cdd 100644
--- a/testing/gtest.gyp
+++ b/testing/gtest.gyp
@@ -121,7 +121,7 @@
],
},
}],
- ['clang==1 or OS=="android"', {
+ ['OS=="android"', {
# We want gtest features that use tr1::tuple, but we currently
# don't support the variadic templates used by libstdc++'s
# implementation. gtest supports this scenario by providing its