diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-08 21:56:50 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-08 21:56:50 +0000 |
| commit | c9542e3faf7285bcfe8ed9c76dfc98025e5afa0c (patch) | |
| tree | a115442b3996ccfe85edfab444901955ab647626 | |
| parent | 8d59189d6bd98f9a0877162f2e0ce0c52c6e04e5 (diff) | |
| download | chromium_src-c9542e3faf7285bcfe8ed9c76dfc98025e5afa0c.zip chromium_src-c9542e3faf7285bcfe8ed9c76dfc98025e5afa0c.tar.gz chromium_src-c9542e3faf7285bcfe8ed9c76dfc98025e5afa0c.tar.bz2 | |
compilation fix for gtest on vs2012
TBR=jam@chromium.org
BUG=143646
Review URL: https://chromiumcodereview.appspot.com/11096005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160717 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | testing/gtest.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/testing/gtest.gyp b/testing/gtest.gyp index bd54cdd..877c55c 100644 --- a/testing/gtest.gyp +++ b/testing/gtest.gyp @@ -121,7 +121,7 @@ ], }, }], - ['OS=="android"', { + ['OS=="android" or (OS=="win" and MSVS_VERSION=="2012")', { # 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 |