diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-10-05 16:23:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-05 16:23:55 -0400 |
| commit | 3149e0e88bf09841009851a478dd835fc557aaa1 (patch) | |
| tree | 22e38a6ba9e82b964f620f55cddb03033e1ffc4b /googlemock/test/gmock-more-actions_test.cc | |
| parent | 4b82df5bb3fab5f6f19a41b7a232f54e37a66d6b (diff) | |
| parent | 40f82ce56a4b416aa4631e48d1d07377793b18ee (diff) | |
| download | googletest-3149e0e88bf09841009851a478dd835fc557aaa1.tar.gz googletest-3149e0e88bf09841009851a478dd835fc557aaa1.tar.bz2 googletest-3149e0e88bf09841009851a478dd835fc557aaa1.zip | |
Merge branch 'master' into python3-tests
Diffstat (limited to 'googlemock/test/gmock-more-actions_test.cc')
| -rw-r--r-- | googlemock/test/gmock-more-actions_test.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/googlemock/test/gmock-more-actions_test.cc b/googlemock/test/gmock-more-actions_test.cc index 08a2df09..976b245e 100644 --- a/googlemock/test/gmock-more-actions_test.cc +++ b/googlemock/test/gmock-more-actions_test.cc @@ -333,7 +333,8 @@ TEST(InvokeTest, FunctionWithUnusedParameters) { Action<int(int, int, bool, int*)> a2 = Invoke(SumOfFirst2); - EXPECT_EQ(23, a2.Perform(make_tuple(20, 3, true, static_cast<int*>(NULL)))); + EXPECT_EQ(23, + a2.Perform(make_tuple(20, 3, true, static_cast<int*>(nullptr)))); } // Tests using Invoke() with methods with parameters declared as Unused. |