Chromium Code Reviews| Index: testing/gtest.gyp |
| diff --git a/testing/gtest.gyp b/testing/gtest.gyp |
| index 877c55c7296cae957238585c3d633f179f363613..9dfb16f79b30d26aca6178f007a0cffc995adceb 100644 |
| --- a/testing/gtest.gyp |
| +++ b/testing/gtest.gyp |
| @@ -121,7 +121,7 @@ |
| ], |
| }, |
| }], |
| - ['OS=="android" or (OS=="win" and MSVS_VERSION=="2012")', { |
|
scottmg
2012/10/09 18:14:06
this was a previous attempt at a fix, but it only
|
| + ['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 |
| @@ -135,6 +135,16 @@ |
| ], |
| }, |
| }], |
| + ['OS=="win" and MSVS_VERSION=="2012"', { |
| + 'defines': [ |
| + '_VARIADIC_MAX=10', |
| + ], |
| + 'direct_dependent_settings': { |
| + 'defines': [ |
| + '_VARIADIC_MAX=10', |
| + ], |
| + }, |
| + }], |
| ], |
| 'direct_dependent_settings': { |
| 'defines': [ |