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