diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-04-12 09:13:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-12 09:13:11 -0400 |
| commit | b640d8743d85f5e69c16679e7ead3f31d94e31ff (patch) | |
| tree | 70bb7c7b555713db2fe60166863bf147c8387d76 /googlemock/include/gmock/gmock-spec-builders.h | |
| parent | fdb57f85710ccb17076acb1870a881964f5e04af (diff) | |
| parent | 1324e2d706d739217cceae361259a5cc01d1ff41 (diff) | |
| download | googletest-b640d8743d85f5e69c16679e7ead3f31d94e31ff.tar.gz googletest-b640d8743d85f5e69c16679e7ead3f31d94e31ff.tar.bz2 googletest-b640d8743d85f5e69c16679e7ead3f31d94e31ff.zip | |
Merge pull request #1557 from pwnall/gmock-fix-ub
Remove multiple inheritance from "unintesting call" mock classes.
Diffstat (limited to 'googlemock/include/gmock/gmock-spec-builders.h')
| -rw-r--r-- | googlemock/include/gmock/gmock-spec-builders.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/googlemock/include/gmock/gmock-spec-builders.h b/googlemock/include/gmock/gmock-spec-builders.h index 6d7f9200..a7be7d15 100644 --- a/googlemock/include/gmock/gmock-spec-builders.h +++ b/googlemock/include/gmock/gmock-spec-builders.h @@ -103,11 +103,6 @@ class ExpectationTester; // Base class for function mockers. template <typename F> class FunctionMockerBase; -// Uninteresting call behavior mixins. -template <typename M> class NiceMockBase; -template <typename M> class NaggyMockBase; -template <typename M> class StrictMockBase; - // Protects the mock object registry (in class Mock), all function // mockers, and all expectations. // @@ -408,13 +403,13 @@ class GTEST_API_ Mock { friend class internal::FunctionMockerBase; template <typename M> - friend class internal::NiceMockBase; + friend class NiceMock; template <typename M> - friend class internal::NaggyMockBase; + friend class NaggyMock; template <typename M> - friend class internal::StrictMockBase; + friend class StrictMock; // Tells Google Mock to allow uninteresting calls on the given mock // object. |