summaryrefslogtreecommitdiffstats
path: root/googlemock/test/gmock_link_test.h
diff options
context:
space:
mode:
authorVadim Barkov <vbrkov@gmail.com>2018-10-28 00:27:51 (GMT)
committerVadim Barkov <vbrkov@gmail.com>2018-10-28 00:27:51 (GMT)
commit3feffddd1e8381209a48c24587e36e030051499f (patch)
tree48b7c34ea4f12ab644eb9c9e203734796784325a /googlemock/test/gmock_link_test.h
parent53d61b5b2382891386bfd41f797118de433b358c (diff)
downloadgoogletest-3feffddd1e8381209a48c24587e36e030051499f.zip
googletest-3feffddd1e8381209a48c24587e36e030051499f.tar.gz
googletest-3feffddd1e8381209a48c24587e36e030051499f.tar.bz2
Replaced all NULLs with nullptr in googlemockrefs/pull/1941/head
Diffstat (limited to 'googlemock/test/gmock_link_test.h')
-rw-r--r--googlemock/test/gmock_link_test.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/googlemock/test/gmock_link_test.h b/googlemock/test/gmock_link_test.h
index e85f750..175d2bd 100644
--- a/googlemock/test/gmock_link_test.h
+++ b/googlemock/test/gmock_link_test.h
@@ -414,7 +414,7 @@ TEST(LinkTest, TestThrow) {
Mock mock;
EXPECT_CALL(mock, VoidFromString(_)).WillOnce(Throw(42));
- EXPECT_THROW(mock.VoidFromString(NULL), int);
+ EXPECT_THROW(mock.VoidFromString(nullptr), int);
}
#endif // GTEST_HAS_EXCEPTIONS