diff options
| author | jgm <jgm@google.com> | 2012-04-10 16:02:11 +0000 |
|---|---|---|
| committer | jgm <jgm@google.com> | 2012-04-10 16:02:11 +0000 |
| commit | 79a367eb217fcd47e2beaf8c0f87fe6d5926f739 (patch) | |
| tree | 148e73f4c3b6354f900cae94be5e9495e04d7efa /include/gmock/gmock-spec-builders.h | |
| parent | 9bcb5f9146db42bc38b6bb744fb0cf518a0205be (diff) | |
| download | googletest-79a367eb217fcd47e2beaf8c0f87fe6d5926f739.tar.gz googletest-79a367eb217fcd47e2beaf8c0f87fe6d5926f739.tar.bz2 googletest-79a367eb217fcd47e2beaf8c0f87fe6d5926f739.zip | |
Reduced template instantiation depth for the AllOf and AnyOf matchers. Also some formatting changes.
Diffstat (limited to 'include/gmock/gmock-spec-builders.h')
| -rw-r--r-- | include/gmock/gmock-spec-builders.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/gmock/gmock-spec-builders.h b/include/gmock/gmock-spec-builders.h index 36c47d67..30721ce6 100644 --- a/include/gmock/gmock-spec-builders.h +++ b/include/gmock/gmock-spec-builders.h @@ -384,6 +384,7 @@ class GTEST_API_ Mock { // verification was successful. static bool VerifyAndClear(void* mock_obj) GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex); + private: friend class internal::UntypedFunctionMockerBase; |