diff options
author | Gennadiy Civil <misterg@google.com> | 2018-04-12 09:13:38 -0400 |
---|---|---|
committer | Gennadiy Civil <misterg@google.com> | 2018-04-12 09:13:38 -0400 |
commit | 07f3bdd4c93dd556d08eba8de3a17cfcbe5cd132 (patch) | |
tree | c5902ce59400b64146728fc2ce3caccadb84ed80 /googlemock/include/gmock/gmock-spec-builders.h | |
parent | 854adb087ba913a867c9ec2228e76febe3c531b5 (diff) | |
parent | b640d8743d85f5e69c16679e7ead3f31d94e31ff (diff) | |
download | googletest-07f3bdd4c93dd556d08eba8de3a17cfcbe5cd132.tar.gz googletest-07f3bdd4c93dd556d08eba8de3a17cfcbe5cd132.tar.bz2 googletest-07f3bdd4c93dd556d08eba8de3a17cfcbe5cd132.zip |
Merge branch 'master' of https://github.com/google/googletest
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. |