From 1c6e68cf6cdd800a8183b54a3dd1a22e5932f1c6 Mon Sep 17 00:00:00 2001
From: Gennadiy Civil <misterg@google.com>
Date: Mon, 16 Apr 2018 10:34:07 -0400
Subject: [PATCH] merging

---
 googlemock/test/gmock-actions_test.cc | 5 ++---
 1 file 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));
 }