diff options
author | Abseil Team <absl-team@google.com> | 2019-01-09 16:08:29 -0500 |
---|---|---|
committer | Shaindel Schwartz <shaindel@google.com> | 2019-01-10 16:18:48 -0500 |
commit | 7a7e2bba1d6257f60faf2188d77e4add829de639 (patch) | |
tree | 6f0d17f57f742fbf4417ea69f80a9469a783c017 | |
parent | 50f1a77955bde27cf49173c4133688d61f201e85 (diff) | |
download | googletest-7a7e2bba1d6257f60faf2188d77e4add829de639.tar.gz googletest-7a7e2bba1d6257f60faf2188d77e4add829de639.tar.bz2 googletest-7a7e2bba1d6257f60faf2188d77e4add829de639.zip |
Googletest export
...text exposed to GitHub repo https://www.github.com/google/googletest
PiperOrigin-RevId: 228573333
-rw-r--r-- | googletest/include/gtest/gtest-matchers.h | 13 |
1 files 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<U, const U&>::value>::type* = nullptr) : impl_(new internal::MatcherInterfaceAdapter<U>(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 <typename Rhs> @@ -724,8 +723,6 @@ class MatchesRegexMatcher { private: const std::shared_ptr<const RE> regex_; const bool full_match_; - - GTEST_DISALLOW_ASSIGN_(MatchesRegexMatcher); }; } // namespace internal |