aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock
diff options
context:
space:
mode:
authorArthur O'Dwyer <arthur.j.odwyer@gmail.com>2020-04-16 15:58:34 -0400
committerArthur O'Dwyer <arthur.j.odwyer@gmail.com>2020-04-23 22:22:34 -0400
commit11b3cec177b1b655148b8352096a3cff10be62d2 (patch)
tree26098d01ba8416f7e2ab9b77b601dae7c2d22e53 /googlemock
parent766ac2e1a413e87d42d67e3286c70f0af4853679 (diff)
downloadgoogletest-11b3cec177b1b655148b8352096a3cff10be62d2.tar.gz
googletest-11b3cec177b1b655148b8352096a3cff10be62d2.tar.bz2
googletest-11b3cec177b1b655148b8352096a3cff10be62d2.zip
Fix a -Wdeprecated warning.
gmock-spec-builders.h:503:3: error: definition of implicit copy constructor for 'Expectation' is deprecated because it has a user-declared destructor [-Werror,-Wdeprecated] ~Expectation(); ^
Diffstat (limited to 'googlemock')
-rw-r--r--googlemock/include/gmock/gmock-spec-builders.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/googlemock/include/gmock/gmock-spec-builders.h b/googlemock/include/gmock/gmock-spec-builders.h
index 2baec446..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