Fixes `-Wtautological-pointer-compare` in gmock-matchers PiperOrigin-RevId: 948667420 Change-Id: Ibb35d7e6469a193607a72f10377ef3a494f9525f
diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h index 7407e11..603a502 100644 --- a/googlemock/include/gmock/gmock-matchers.h +++ b/googlemock/include/gmock/gmock-matchers.h
@@ -821,7 +821,11 @@ template <typename Pointer> bool MatchAndExplain(const Pointer& p, MatchResultListener* /* listener */) const { - return p == nullptr; + if constexpr (std::is_function_v<Pointer>) { + return false; + } else { + return p == nullptr; + } } void DescribeTo(::std::ostream* os) const { *os << "is NULL"; } @@ -835,7 +839,11 @@ template <typename Pointer> bool MatchAndExplain(const Pointer& p, MatchResultListener* /* listener */) const { - return p != nullptr; + if constexpr (std::is_function_v<Pointer>) { + return true; + } else { + return p != nullptr; + } } void DescribeTo(::std::ostream* os) const { *os << "isn't NULL"; }