diff options
| author | Jonny007-MKD <Jonny007-MKD@users.noreply.github.com> | 2018-09-14 22:39:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-14 22:39:45 +0200 |
| commit | 631e3a58389a21bec310470b7788b30dfa17a217 (patch) | |
| tree | 4aee2a3d4206bf44197f60b051fd8700030dbbe3 /googlemock/include/gmock | |
| parent | 1b2da360eddeb98f4ee45efabb0056cc28590760 (diff) | |
| parent | bc2d0935b74917be0821bfd834472ed9cc4a3b5b (diff) | |
| download | googletest-631e3a58389a21bec310470b7788b30dfa17a217.tar.gz googletest-631e3a58389a21bec310470b7788b30dfa17a217.tar.bz2 googletest-631e3a58389a21bec310470b7788b30dfa17a217.zip | |
Merge branch 'master' into master
Diffstat (limited to 'googlemock/include/gmock')
| -rw-r--r-- | googlemock/include/gmock/gmock-matchers.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h index a7bcfc83..fa26bf9b 100644 --- a/googlemock/include/gmock/gmock-matchers.h +++ b/googlemock/include/gmock/gmock-matchers.h @@ -1307,9 +1307,6 @@ class StrEqualityMatcher { #if GTEST_HAS_ABSL bool MatchAndExplain(const absl::string_view& s, MatchResultListener* listener) const { - if (s.data() == NULL) { - return !expect_eq_; - } // This should fail to compile if absl::string_view is used with wide // strings. const StringType& str = string(s); @@ -1380,9 +1377,6 @@ class HasSubstrMatcher { #if GTEST_HAS_ABSL bool MatchAndExplain(const absl::string_view& s, MatchResultListener* listener) const { - if (s.data() == NULL) { - return false; - } // This should fail to compile if absl::string_view is used with wide // strings. const StringType& str = string(s); @@ -1440,9 +1434,6 @@ class StartsWithMatcher { #if GTEST_HAS_ABSL bool MatchAndExplain(const absl::string_view& s, MatchResultListener* listener) const { - if (s.data() == NULL) { - return false; - } // This should fail to compile if absl::string_view is used with wide // strings. const StringType& str = string(s); @@ -1499,9 +1490,6 @@ class EndsWithMatcher { #if GTEST_HAS_ABSL bool MatchAndExplain(const absl::string_view& s, MatchResultListener* listener) const { - if (s.data() == NULL) { - return false; - } // This should fail to compile if absl::string_view is used with wide // strings. const StringType& str = string(s); @@ -1558,7 +1546,7 @@ class MatchesRegexMatcher { #if GTEST_HAS_ABSL bool MatchAndExplain(const absl::string_view& s, MatchResultListener* listener) const { - return s.data() && MatchAndExplain(string(s), listener); + return MatchAndExplain(string(s), listener); } #endif // GTEST_HAS_ABSL |