From bc1023b4131c6e360803d4de2965a98afe3c146c Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Wed, 9 Jan 2019 16:08:29 -0500 Subject: Googletest export Fix warning about deprecation of implicit operations such as copy constructors or assignment operators. Specifically: MatcherBase's default copy constructor, assignment operator, move operator, and move assignment operator are now declared explicitly rather than depending on the compiler implicit generation (which is disallowed/warned against due to MatcherBase's declaration of the destructor). PiperOrigin-RevId: 228573333 --- googletest/include/gtest/gtest-matchers.h | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/googletest/include/gtest/gtest-matchers.h b/googletest/include/gtest/gtest-matchers.h index 7bc855b8..128fdb2f 100644 --- a/googletest/include/gtest/gtest-matchers.h +++ b/googletest/include/gtest/gtest-matchers.h @@ -296,6 +296,11 @@ class MatcherBase { !internal::IsSame::value>::type* = nullptr) : impl_(new internal::MatcherInterfaceAdapter(impl)) {} + MatcherBase(const MatcherBase&) = default; + MatcherBase& operator=(const MatcherBase&) = default; + MatcherBase(MatcherBase&&) = default; + MatcherBase& operator=(MatcherBase&&) = default; + virtual ~MatcherBase() {} private: @@ -545,13 +550,9 @@ class PolymorphicMatcher { private: const Impl impl_; - - GTEST_DISALLOW_ASSIGN_(MonomorphicImpl); }; Impl impl_; - - GTEST_DISALLOW_ASSIGN_(PolymorphicMatcher); }; // Creates a matcher from its implementation. This is easier to use @@ -618,10 +619,8 @@ class ComparisonBase { private: Rhs rhs_; - GTEST_DISALLOW_ASSIGN_(Impl); }; Rhs rhs_; - GTEST_DISALLOW_ASSIGN_(ComparisonBase); }; template @@ -724,8 +723,6 @@ class MatchesRegexMatcher { private: const std::shared_ptr regex_; const bool full_match_; - - GTEST_DISALLOW_ASSIGN_(MatchesRegexMatcher); }; } // namespace internal -- cgit v1.2.3