diff options
| author | Jerry Turcios <jerryturcios08@gmail.com> | 2018-10-07 23:09:07 -0400 |
|---|---|---|
| committer | Jerry Turcios <jerryturcios08@gmail.com> | 2018-10-07 23:09:07 -0400 |
| commit | 4327d95b3e5e13aab0d2edcf6cc7d2060f83f89a (patch) | |
| tree | f33a48a60c4b6c3d0c7ea58588af56ddefce1051 /googlemock/test/gmock-more-actions_test.cc | |
| parent | 7caf5ffd1dc8db7625b393a36846471e5c5f45e3 (diff) | |
| parent | 40f82ce56a4b416aa4631e48d1d07377793b18ee (diff) | |
| download | googletest-4327d95b3e5e13aab0d2edcf6cc7d2060f83f89a.tar.gz googletest-4327d95b3e5e13aab0d2edcf6cc7d2060f83f89a.tar.bz2 googletest-4327d95b3e5e13aab0d2edcf6cc7d2060f83f89a.zip | |
Merge branch 'master' of https://github.com/google/googletest
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. |