summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGennadiy Civil <gennadiycivil@users.noreply.github.com>2018-04-16 15:02:12 (GMT)
committerGitHub <noreply@github.com>2018-04-16 15:02:12 (GMT)
commit1f605414cc4137f0ad0cde4d0c7366ff2dfac590 (patch)
tree6aa24d9b24919f4ace084aed9f69ba043fe58e26
parent247ded32368f26d034028f13bfe71671b86a1187 (diff)
parent9fba10315628d4e93d2975ae9c9a214b9665cc59 (diff)
downloadgoogletest-1f605414cc4137f0ad0cde4d0c7366ff2dfac590.zip
googletest-1f605414cc4137f0ad0cde4d0c7366ff2dfac590.tar.gz
googletest-1f605414cc4137f0ad0cde4d0c7366ff2dfac590.tar.bz2
Merge pull request #1576 from gennadiycivil/master
merging
-rw-r--r--googlemock/test/gmock-actions_test.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/googlemock/test/gmock-actions_test.cc b/googlemock/test/gmock-actions_test.cc
index 08f2a55..7fbb50d 100644
--- a/googlemock/test/gmock-actions_test.cc
+++ b/googlemock/test/gmock-actions_test.cc
@@ -1541,7 +1541,7 @@ TEST(FunctorActionTest, UnusedArguments) {
// Verify that users can ignore uninteresting arguments.
Action<int(int, double y, double z)> a =
[](int i, Unused, Unused) { return 2 * i; };
- tuple<int, double, double> dummy = make_tuple(3, 7.3, 9);
+ tuple<int, double, double> dummy = make_tuple(3, 7.3, 9.44);
EXPECT_EQ(6, a.Perform(dummy));
}