diff options
author | Gennadiy Rozental <rogeeff@google.com> | 2020-05-01 17:11:43 -0400 |
---|---|---|
committer | Gennadiy Rozental <rogeeff@google.com> | 2020-05-01 17:11:43 -0400 |
commit | ef25d27d4604556a1bee916f1c2bf03227c13c4e (patch) | |
tree | abb0a3db076ddf033721fa04a3d768513f7619d2 /googlemock/include/gmock/gmock-spec-builders.h | |
parent | 955552518b4e0ad0249396e6885c0f18cd4ce529 (diff) | |
parent | 1b066f4edfd5f84beed1bb164bd3816a6d7158fe (diff) | |
download | googletest-ef25d27d4604556a1bee916f1c2bf03227c13c4e.tar.gz googletest-ef25d27d4604556a1bee916f1c2bf03227c13c4e.tar.bz2 googletest-ef25d27d4604556a1bee916f1c2bf03227c13c4e.zip |
Merge pull request #2815 from Quuxplusone:simple
PiperOrigin-RevId: 308625388
Diffstat (limited to 'googlemock/include/gmock/gmock-spec-builders.h')
-rw-r--r-- | googlemock/include/gmock/gmock-spec-builders.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/googlemock/include/gmock/gmock-spec-builders.h b/googlemock/include/gmock/gmock-spec-builders.h index 4b5fc661..ac215501 100644 --- a/googlemock/include/gmock/gmock-spec-builders.h +++ b/googlemock/include/gmock/gmock-spec-builders.h @@ -499,7 +499,10 @@ class GTEST_API_ Expectation { public: // Constructs a null object that doesn't reference any expectation. Expectation(); - + Expectation(Expectation&&) = default; + Expectation(const Expectation&) = default; + Expectation& operator=(Expectation&&) = default; + Expectation& operator=(const Expectation&) = default; ~Expectation(); // This single-argument ctor must not be explicit, in order to support the @@ -879,8 +882,6 @@ class GTEST_API_ ExpectationBase { Clause last_clause_; mutable bool action_count_checked_; // Under mutex_. mutable Mutex mutex_; // Protects action_count_checked_. - - GTEST_DISALLOW_ASSIGN_(ExpectationBase); }; // class ExpectationBase // Impements an expectation for the given function type. @@ -1295,8 +1296,6 @@ class MockSpec { internal::FunctionMocker<F>* const function_mocker_; // The argument matchers specified in the spec. ArgumentMatcherTuple matchers_; - - GTEST_DISALLOW_ASSIGN_(MockSpec); }; // class MockSpec // Wrapper type for generically holding an ordinary value or lvalue reference. |