diff options
| author | kosak@google.com <kosak@google.com@8415998a-534a-0410-bf83-d39667b30386> | 2015-04-28 22:36:31 +0000 |
|---|---|---|
| committer | kosak@google.com <kosak@google.com@8415998a-534a-0410-bf83-d39667b30386> | 2015-04-28 22:36:31 +0000 |
| commit | 8c791542b10da35a1b439e999786c4b006943ce5 (patch) | |
| tree | 24c9b7b5a78b756ceb6bca09336124c403a03703 /include | |
| parent | 595e1ae06f27440309e48f678dab5537ebcaf930 (diff) | |
| download | googlemock-8c791542b10da35a1b439e999786c4b006943ce5.tar.gz | |
Change IsNull and NotNull to use ==/!= nullptr in C++11.
Also update gmock_doctor due to Clang wording change.
git-svn-id: http://googlemock.googlecode.com/svn/trunk@518 8415998a-534a-0410-bf83-d39667b30386
Diffstat (limited to 'include')
| -rw-r--r-- | include/gmock/gmock-matchers.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/gmock/gmock-matchers.h b/include/gmock/gmock-matchers.h index 6450f9b..822337b 100644 --- a/include/gmock/gmock-matchers.h +++ b/include/gmock/gmock-matchers.h @@ -979,7 +979,11 @@ class IsNullMatcher { template <typename Pointer> bool MatchAndExplain(const Pointer& p, MatchResultListener* /* listener */) const { +#if GTEST_LANG_CXX11 + return p == nullptr; +#else // GTEST_LANG_CXX11 return GetRawPointer(p) == NULL; +#endif // GTEST_LANG_CXX11 } void DescribeTo(::std::ostream* os) const { *os << "is NULL"; } @@ -995,7 +999,11 @@ class NotNullMatcher { template <typename Pointer> bool MatchAndExplain(const Pointer& p, MatchResultListener* /* listener */) const { +#if GTEST_LANG_CXX11 + return p != nullptr; +#else // GTEST_LANG_CXX11 return GetRawPointer(p) != NULL; +#endif // GTEST_LANG_CXX11 } void DescribeTo(::std::ostream* os) const { *os << "isn't NULL"; } |