diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-16 18:25:37 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-16 18:25:37 +0000 |
| commit | c21e0e82db0a3e9a60940f7ceea74edb5a1c4122 (patch) | |
| tree | 1bf0d8d3ab7e2adab9893158a8be1f8638698e62 /testing | |
| parent | a3cd502bb5891548171a4bb17fe1ce351cd45ba7 (diff) | |
| download | chromium_src-c21e0e82db0a3e9a60940f7ceea74edb5a1c4122.zip chromium_src-c21e0e82db0a3e9a60940f7ceea74edb5a1c4122.tar.gz chromium_src-c21e0e82db0a3e9a60940f7ceea74edb5a1c4122.tar.bz2 | |
patch
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49982 0039d316-1c4b-4281-b951-d872f2087c98
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', ], }, }], |