generic-library/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3195 from Inujel:fix-3194

Browse Source 
PiperOrigin-RevId: 398271948
This commit is contained in:
dinord 2021-09-23 23:31:42 +00:00
commit e4717df71a
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
googlemock/include/gmock/gmock-matchers.h
View File

@ -2425,7 +2425,6 @@ class ContainerEqMatcher {
typedef internal::StlContainerView< typedef internal::StlContainerView<
typename std::remove_const<LhsContainer>::type> typename std::remove_const<LhsContainer>::type>
LhsView; LhsView;
typedef typename LhsView::type LhsStlContainer;
StlContainerReference lhs_stl_container = LhsView::ConstReference(lhs); StlContainerReference lhs_stl_container = LhsView::ConstReference(lhs);
if (lhs_stl_container == expected_) if (lhs_stl_container == expected_)
return true; return true;
@ -2434,8 +2433,7 @@ class ContainerEqMatcher {
if (os != nullptr) { if (os != nullptr) {
// Something is different. Check for extra values first. // Something is different. Check for extra values first.
bool printed_header = false; bool printed_header = false;
for (typename LhsStlContainer::const_iterator it = for (auto it = lhs_stl_container.begin();
lhs_stl_container.begin();
it != lhs_stl_container.end(); ++it) { it != lhs_stl_container.end(); ++it) {
if (internal::ArrayAwareFind(expected_.begin(), expected_.end(), *it) == if (internal::ArrayAwareFind(expected_.begin(), expected_.end(), *it) ==
expected_.end()) { expected_.end()) {
@ -2451,7 +2449,7 @@ class ContainerEqMatcher {
// Now check for missing values. // Now check for missing values.
bool printed_header2 = false; bool printed_header2 = false;
for (typename StlContainer::const_iterator it = expected_.begin(); for (auto it = expected_.begin();
it != expected_.end(); ++it) { it != expected_.end(); ++it) {
if (internal::ArrayAwareFind( if (internal::ArrayAwareFind(
lhs_stl_container.begin(), lhs_stl_container.end(), *it) == lhs_stl_container.begin(), lhs_stl_container.end(), *it) ==
@ -2635,8 +2633,8 @@ class PointwiseMatcher {
return false; return false;
} }
typename LhsStlContainer::const_iterator left = lhs_stl_container.begin(); auto left = lhs_stl_container.begin();
typename RhsStlContainer::const_iterator right = rhs_.begin(); auto right = rhs_.begin();
for (size_t i = 0; i != actual_size; ++i, ++left, ++right) { for (size_t i = 0; i != actual_size; ++i, ++left, ++right) {
if (listener->IsInterested()) { if (listener->IsInterested()) {
StringMatchResultListener inner_listener; StringMatchResultListener inner_listener;
@ -2699,7 +2697,7 @@ class QuantifierMatcherImpl : public MatcherInterface<Container> {
MatchResultListener* listener) const { MatchResultListener* listener) const {
StlContainerReference stl_container = View::ConstReference(container); StlContainerReference stl_container = View::ConstReference(container);
size_t i = 0; size_t i = 0;
for (typename StlContainer::const_iterator it = stl_container.begin(); for (auto it = stl_container.begin();
it != stl_container.end(); ++it, ++i) { it != stl_container.end(); ++it, ++i) {
StringMatchResultListener inner_listener; StringMatchResultListener inner_listener;
const bool matches = inner_matcher_.MatchAndExplain(*it, &inner_listener); const bool matches = inner_matcher_.MatchAndExplain(*it, &inner_listener);
@ -3400,7 +3398,7 @@ class ElementsAreMatcherImpl : public MatcherInterface<Container> {
// explanations[i] is the explanation of the element at index i. // explanations[i] is the explanation of the element at index i.
::std::vector<std::string> explanations(count()); ::std::vector<std::string> explanations(count());
StlContainerReference stl_container = View::ConstReference(container); StlContainerReference stl_container = View::ConstReference(container);
typename StlContainer::const_iterator it = stl_container.begin(); auto it = stl_container.begin();
size_t exam_pos = 0; size_t exam_pos = 0;
bool mismatch_found = false; // Have we found a mismatched element yet? bool mismatch_found = false; // Have we found a mismatched element yet?
@ -3593,7 +3591,6 @@ class UnorderedElementsAreMatcherImpl
typedef internal::StlContainerView<RawContainer> View; typedef internal::StlContainerView<RawContainer> View;
typedef typename View::type StlContainer; typedef typename View::type StlContainer;
typedef typename View::const_reference StlContainerReference; typedef typename View::const_reference StlContainerReference;
typedef typename StlContainer::const_iterator StlContainerConstIterator;
typedef typename StlContainer::value_type Element; typedef typename StlContainer::value_type Element;
template <typename InputIter> template <typename InputIter>
@ -4760,7 +4757,7 @@ UnorderedPointwise(const Tuple2Matcher& tuple2_matcher,
// Create a matcher for each element in rhs_container. // Create a matcher for each element in rhs_container.
::std::vector<internal::BoundSecondMatcher<Tuple2Matcher, Second> > matchers; ::std::vector<internal::BoundSecondMatcher<Tuple2Matcher, Second> > matchers;
for (typename RhsStlContainer::const_iterator it = rhs_stl_container.begin(); for (auto it = rhs_stl_container.begin();
it != rhs_stl_container.end(); ++it) { it != rhs_stl_container.end(); ++it) {
matchers.push_back( matchers.push_back(
internal::MatcherBindSecond(tuple2_matcher, *it)); internal::MatcherBindSecond(tuple2_matcher, *it));

2
googletest/src/gtest-internal-inl.h
View File

@ -273,7 +273,7 @@ inline int CountIf(const Container& c, Predicate predicate) {
// Implemented as an explicit loop since std::count_if() in libCstd on // Implemented as an explicit loop since std::count_if() in libCstd on
// Solaris has a non-standard signature. // Solaris has a non-standard signature.
int count = 0; int count = 0;
for (typename Container::const_iterator it = c.begin(); it != c.end(); ++it) { for (auto it = c.begin(); it != c.end(); ++it) {
if (predicate(*it)) if (predicate(*it))
++count; ++count;
} }