summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormisterg <misterg@google.com>2018-10-09 18:18:16 (GMT)
committerGennadiy Civil <misterg@google.com>2018-10-09 20:25:51 (GMT)
commit5434989dbd8a15f14f33cbeb9d94801247031c95 (patch)
tree45054f1215bffa22dcfe25279c25ca3fb6d7e802
parentb652edb39c7e9d25640adc428707244b83902aaf (diff)
downloadgoogletest-5434989dbd8a15f14f33cbeb9d94801247031c95.zip
googletest-5434989dbd8a15f14f33cbeb9d94801247031c95.tar.gz
googletest-5434989dbd8a15f14f33cbeb9d94801247031c95.tar.bz2
Remove testing::internal::BothOfMatcher, no longer needed
PiperOrigin-RevId: 216389313
-rw-r--r--googlemock/include/gmock/gmock-matchers.h26
1 files changed, 0 insertions, 26 deletions
diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h
index 9772f15..9d31e5d 100644
--- a/googlemock/include/gmock/gmock-matchers.h
+++ b/googlemock/include/gmock/gmock-matchers.h
@@ -1815,32 +1815,6 @@ class VariadicMatcher {
template <typename... Args>
using AllOfMatcher = VariadicMatcher<AllOfMatcherImpl, Args...>;
-// Used for implementing the AllOf(m_1, ..., m_n) matcher, which
-// matches a value that matches all of the matchers m_1, ..., and m_n.
-template <typename Matcher1, typename Matcher2>
-class BothOfMatcher {
- public:
- BothOfMatcher(Matcher1 matcher1, Matcher2 matcher2)
- : matcher1_(matcher1), matcher2_(matcher2) {}
-
- // This template type conversion operator allows a
- // BothOfMatcher<Matcher1, Matcher2> object to match any type that
- // both Matcher1 and Matcher2 can match.
- template <typename T>
- operator Matcher<T>() const {
- std::vector<Matcher<T> > values;
- values.push_back(SafeMatcherCast<T>(matcher1_));
- values.push_back(SafeMatcherCast<T>(matcher2_));
- return Matcher<T>(new AllOfMatcherImpl<T>(internal::move(values)));
- }
-
- private:
- Matcher1 matcher1_;
- Matcher2 matcher2_;
-
- GTEST_DISALLOW_ASSIGN_(BothOfMatcher);
-};
-
// Implements the AnyOf(m1, m2) matcher for a particular argument type
// T. We do not nest it inside the AnyOfMatcher class template, as
// that will prevent different instantiations of AnyOfMatcher from