From 26c10dc7e6505b5880c6d3bd87e033864ce23eab Mon Sep 17 00:00:00 2001
From: Gennadiy Civil <misterg@google.com>
Date: Mon, 16 Apr 2018 10:16:48 -0400
Subject: merging

---
 googlemock/test/gmock-actions_test.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/googlemock/test/gmock-actions_test.cc b/googlemock/test/gmock-actions_test.cc
index 08f2a55..646a10c 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));
 }
 
-- 
cgit v0.12


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: 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 646a10c..e391428 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));
 }
 
-- 
cgit v0.12


From 9fba10315628d4e93d2975ae9c9a214b9665cc59 Mon Sep 17 00:00:00 2001
From: Gennadiy Civil <misterg@google.com>
Date: Mon, 16 Apr 2018 10:42:08 -0400
Subject: merging, testing, this should be it

---
 googlemock/test/gmock-actions_test.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/googlemock/test/gmock-actions_test.cc b/googlemock/test/gmock-actions_test.cc
index e391428..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, const int&> dummy = make_tuple(3, 7.3, 9.44);
+  tuple<int, double, double> dummy = make_tuple(3, 7.3, 9.44);
   EXPECT_EQ(6, a.Perform(dummy));
 }
 
-- 
cgit v0.12