diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-10-29 13:46:24 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-10-29 13:46:24 -0400 |
| commit | e9085769d4819f8491a5ab19e9e3813144e6aa13 (patch) | |
| tree | 55a2496790bc46370f84234d179db810926a6d95 /googlemock/test/gmock_link_test.h | |
| parent | 80b43d900b8ed44e16b306682d47d73175cecc7f (diff) | |
| parent | 3feffddd1e8381209a48c24587e36e030051499f (diff) | |
| download | googletest-e9085769d4819f8491a5ab19e9e3813144e6aa13.tar.gz googletest-e9085769d4819f8491a5ab19e9e3813144e6aa13.tar.bz2 googletest-e9085769d4819f8491a5ab19e9e3813144e6aa13.zip | |
Merge pull request #1941 from barkovv:master
PiperOrigin-RevId: 219134349
Diffstat (limited to 'googlemock/test/gmock_link_test.h')
| -rw-r--r-- | googlemock/test/gmock_link_test.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googlemock/test/gmock_link_test.h b/googlemock/test/gmock_link_test.h index e85f7502..175d2bdd 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 |