Googletest export

Tolerate std::string's explicit copy construction from std::string_view. PiperOrigin-RevId: 277583394

Googletest export
Tolerate std::string's explicit copy construction from std::string_view. PiperOrigin-RevId: 277583394
e2fc3a9c · Abseil Team · vslashg · 0a034808 · e2fc3a9c
Commit e2fc3a9c authored Oct 30, 2019 by Abseil Team Committed by vslashg Oct 31, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

googlemock/include/gmock/gmock-matchers.h googlemock/include/gmock/gmock-matchers.h +1 -2

No files found.
--- a/googlemock/include/gmock/gmock-matchers.h
+++ b/googlemock/include/gmock/gmock-matchers.h
@@ -758,8 +758,7 @@ class HasSubstrMatcher {
  template <typename MatcheeStringType>
  bool MatchAndExplain(const MatcheeStringType& s,
                       MatchResultListener* /* listener */) const {
-    const StringType& s2(s);
+    return StringType(s).find(substring_) != StringType::npos;
-    return s2.find(substring_) != StringType::npos;
  }
  // Describes what this matcher matches.