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: [PATCH] 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 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));
}