diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-16 10:34:07 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-16 10:34:07 -0400 |
| commit | 1c6e68cf6cdd800a8183b54a3dd1a22e5932f1c6 (patch) | |
| tree | 5517b7d870e491148edff31c1012d63fcbab8160 | |
| parent | 26c10dc7e6505b5880c6d3bd87e033864ce23eab (diff) | |
| download | googletest-1c6e68cf6cdd800a8183b54a3dd1a22e5932f1c6.tar.gz googletest-1c6e68cf6cdd800a8183b54a3dd1a22e5932f1c6.tar.bz2 googletest-1c6e68cf6cdd800a8183b54a3dd1a22e5932f1c6.zip | |
merging
| -rw-r--r-- | googlemock/test/gmock-actions_test.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/googlemock/test/gmock-actions_test.cc b/googlemock/test/gmock-actions_test.cc index 646a10c1..e391428f 100644 --- a/googlemock/test/gmock-actions_test.cc +++ b/googlemock/test/gmock-actions_test.cc @@ -1539,10 +1539,9 @@ TEST(FunctorActionTest, TypeConversion) { TEST(FunctorActionTest, UnusedArguments) { // Verify that users can ignore uninteresting arguments. - Action<int(int, double y, const int&)> a = + Action<int(int, double y, double z)> a = [](int i, Unused, Unused) { return 2 * i; }; - int nine = 9; - tuple<int, double, const int&> dummy = make_tuple(3, 7.3, nine); + tuple<int, double, const int&> dummy = make_tuple(3, 7.3, 9.44); EXPECT_EQ(6, a.Perform(dummy)); } |