gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change IsNull and NotNull to use ==/!= nullptr in C++11.

Browse Source 
Also update gmock_doctor due to Clang wording change.
This commit is contained in:
kosak
2015-04-28 22:36:31 +00:00
parent 5625dd333a
commit 6305ff5a92
3 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/gmock/gmock-matchers.h
View File

@@ -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"; }