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
marcosholgado · Oct 8, 2012 · c9542e3 · c9542e3
1 parent 8d59189
commit c9542e3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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