summaryrefslogtreecommitdiffstats
path: root/googlemock
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2018-04-11 13:20:48 (GMT)
committerGennadiy Civil <misterg@google.com>2018-04-11 13:20:48 (GMT)
commitb15be9a819ee3e0a36fcc8172a00ecf41e79f230 (patch)
tree5ababc641d9f37ee16ae7c2024291b89c23da96d /googlemock
parent6f9db26159f8a568b9af4410a7936f7018d30886 (diff)
downloadgoogletest-b15be9a819ee3e0a36fcc8172a00ecf41e79f230.zip
googletest-b15be9a819ee3e0a36fcc8172a00ecf41e79f230.tar.gz
googletest-b15be9a819ee3e0a36fcc8172a00ecf41e79f230.tar.bz2
fixing osx pizza
Diffstat (limited to 'googlemock')
-rw-r--r--googlemock/test/gmock-generated-actions_test.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/googlemock/test/gmock-generated-actions_test.cc b/googlemock/test/gmock-generated-actions_test.cc
index b821e5a..1d685e5 100644
--- a/googlemock/test/gmock-generated-actions_test.cc
+++ b/googlemock/test/gmock-generated-actions_test.cc
@@ -376,7 +376,8 @@ class SubstractAction : public ActionInterface<int(int, int)> { // NOLINT
TEST(WithArgsTest, NonInvokeAction) {
Action<int(const std::string&, int, int)> a = // NOLINT
WithArgs<2, 1>(MakeAction(new SubstractAction));
- EXPECT_EQ(8, a.Perform(make_tuple(std::string("hi"), 2, 10)));
+ tuple<std::string, int, int> dummy = make_tuple(std::string("hi"), 2, 10);
+ EXPECT_EQ(8, a.Perform(dummy));
}
// Tests using WithArgs to pass all original arguments in the original order.