diff options
Diffstat (limited to 'googlemock/test/gmock-more-actions_test.cc')
| -rw-r--r-- | googlemock/test/gmock-more-actions_test.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/googlemock/test/gmock-more-actions_test.cc b/googlemock/test/gmock-more-actions_test.cc index 9477fe9..77e15bd 100644 --- a/googlemock/test/gmock-more-actions_test.cc +++ b/googlemock/test/gmock-more-actions_test.cc @@ -327,7 +327,9 @@ TEST(InvokeTest, FunctionThatTakes10Arguments) { TEST(InvokeTest, FunctionWithUnusedParameters) { Action<int(int, int, double, const string&)> a1 = Invoke(SumOfFirst2); - EXPECT_EQ(12, a1.Perform(make_tuple(10, 2, 5.6, string("hi")))); + string s("hi"); + EXPECT_EQ(12, a1.Perform( + tuple<int, int, double, const string&>(10, 2, 5.6, s))); Action<int(int, int, bool, int*)> a2 = Invoke(SumOfFirst2); @@ -379,7 +381,8 @@ TEST(InvokeMethodTest, Binary) { Foo foo; Action<string(const string&, char)> a = Invoke(&foo, &Foo::Binary); string s("Hell"); - EXPECT_EQ("Hello", a.Perform(make_tuple(s, 'o'))); + EXPECT_EQ("Hello", a.Perform( + tuple<const string&, char>(s, 'o'))); } // Tests using Invoke() with a ternary method. |