gtest-matchers.cc (googletest-release-1.10.0) | : | gtest-matchers.cc (googletest-release-1.11.0) | ||
---|---|---|---|---|
skipping to change at line 61 | skipping to change at line 61 | |||
} | } | |||
// Constructs a matcher that matches a std::string whose value is equal to | // Constructs a matcher that matches a std::string whose value is equal to | |||
// s. | // s. | |||
Matcher<std::string>::Matcher(const std::string& s) { *this = Eq(s); } | Matcher<std::string>::Matcher(const std::string& s) { *this = Eq(s); } | |||
// Constructs a matcher that matches a std::string whose value is equal to | // Constructs a matcher that matches a std::string whose value is equal to | |||
// s. | // s. | |||
Matcher<std::string>::Matcher(const char* s) { *this = Eq(std::string(s)); } | Matcher<std::string>::Matcher(const char* s) { *this = Eq(std::string(s)); } | |||
#if GTEST_HAS_ABSL | #if GTEST_INTERNAL_HAS_STRING_VIEW | |||
// Constructs a matcher that matches a const absl::string_view& whose value is | // Constructs a matcher that matches a const StringView& whose value is | |||
// equal to s. | // equal to s. | |||
Matcher<const absl::string_view&>::Matcher(const std::string& s) { | Matcher<const internal::StringView&>::Matcher(const std::string& s) { | |||
*this = Eq(s); | *this = Eq(s); | |||
} | } | |||
// Constructs a matcher that matches a const absl::string_view& whose value is | // Constructs a matcher that matches a const StringView& whose value is | |||
// equal to s. | // equal to s. | |||
Matcher<const absl::string_view&>::Matcher(const char* s) { | Matcher<const internal::StringView&>::Matcher(const char* s) { | |||
*this = Eq(std::string(s)); | *this = Eq(std::string(s)); | |||
} | } | |||
// Constructs a matcher that matches a const absl::string_view& whose value is | // Constructs a matcher that matches a const StringView& whose value is | |||
// equal to s. | // equal to s. | |||
Matcher<const absl::string_view&>::Matcher(absl::string_view s) { | Matcher<const internal::StringView&>::Matcher(internal::StringView s) { | |||
*this = Eq(std::string(s)); | *this = Eq(std::string(s)); | |||
} | } | |||
// Constructs a matcher that matches a absl::string_view whose value is equal to | // Constructs a matcher that matches a StringView whose value is equal to | |||
// s. | // s. | |||
Matcher<absl::string_view>::Matcher(const std::string& s) { *this = Eq(s); } | Matcher<internal::StringView>::Matcher(const std::string& s) { *this = Eq(s); } | |||
// Constructs a matcher that matches a absl::string_view whose value is equal to | // Constructs a matcher that matches a StringView whose value is equal to | |||
// s. | // s. | |||
Matcher<absl::string_view>::Matcher(const char* s) { | Matcher<internal::StringView>::Matcher(const char* s) { | |||
*this = Eq(std::string(s)); | *this = Eq(std::string(s)); | |||
} | } | |||
// Constructs a matcher that matches a absl::string_view whose value is equal to | // Constructs a matcher that matches a StringView whose value is equal to | |||
// s. | // s. | |||
Matcher<absl::string_view>::Matcher(absl::string_view s) { | Matcher<internal::StringView>::Matcher(internal::StringView s) { | |||
*this = Eq(std::string(s)); | *this = Eq(std::string(s)); | |||
} | } | |||
#endif // GTEST_HAS_ABSL | #endif // GTEST_INTERNAL_HAS_STRING_VIEW | |||
} // namespace testing | } // namespace testing | |||
End of changes. 13 change blocks. | ||||
14 lines changed or deleted | 14 lines changed or added |