diff options
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/gmock/include/gmock/gmock-actions.h | 2 | ||||
| -rw-r--r-- | testing/gtest.gyp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/testing/gmock/include/gmock/gmock-actions.h b/testing/gmock/include/gmock/gmock-actions.h index 007ad9d..d7baa5d 100644 --- a/testing/gmock/include/gmock/gmock-actions.h +++ b/testing/gmock/include/gmock/gmock-actions.h @@ -680,7 +680,7 @@ class SetArgumentPointeeAction { template <typename Result, typename ArgumentTuple> void Perform(const ArgumentTuple& args) const { - CompileAssertTypesEqual<void, Result>(); + // CompileAssertTypesEqual<void, Result>(); *::std::tr1::get<N>(args) = value_; } diff --git a/testing/gtest.gyp b/testing/gtest.gyp index c8f64e5..706f11d 100644 --- a/testing/gtest.gyp +++ b/testing/gtest.gyp @@ -69,10 +69,12 @@ # 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', ], }, }], |