diff options
| -rw-r--r-- | googlemock/include/gmock/gmock-matchers.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h index 70e7a76..16cf9c3 100644 --- a/googlemock/include/gmock/gmock-matchers.h +++ b/googlemock/include/gmock/gmock-matchers.h @@ -1523,7 +1523,7 @@ class SomeOfArrayMatcher { } private: - const ::std::vector<T> matchers_; + const std::vector<std::remove_const_t<T>> matchers_; }; template <typename T> @@ -3805,7 +3805,7 @@ class UnorderedElementsAreArrayMatcher { private: UnorderedMatcherRequire::Flags match_flags_; - ::std::vector<T> matchers_; + std::vector<std::remove_const_t<T>> matchers_; }; // Implements ElementsAreArray(). @@ -3826,7 +3826,7 @@ class ElementsAreArrayMatcher { } private: - const ::std::vector<T> matchers_; + const std::vector<std::remove_const_t<T>> matchers_; }; // Given a 2-tuple matcher tm of type Tuple2Matcher and a value second @@ -4793,9 +4793,10 @@ Pointwise(const TupleMatcher& tuple_matcher, const Container& rhs) { // Supports the Pointwise(m, {a, b, c}) syntax. template <typename TupleMatcher, typename T> -inline internal::PointwiseMatcher<TupleMatcher, std::vector<T>> Pointwise( - const TupleMatcher& tuple_matcher, std::initializer_list<T> rhs) { - return Pointwise(tuple_matcher, std::vector<T>(rhs)); +inline internal::PointwiseMatcher<TupleMatcher, + std::vector<std::remove_const_t<T>>> +Pointwise(const TupleMatcher& tuple_matcher, std::initializer_list<T> rhs) { + return Pointwise(tuple_matcher, std::vector<std::remove_const_t<T>>(rhs)); } // UnorderedPointwise(pair_matcher, rhs) matches an STL-style |