summaryrefslogtreecommitdiffstats
path: root/googlemock/test/gmock-generated-actions_test.cc
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2018-04-11 13:33:51 (GMT)
committerGennadiy Civil <misterg@google.com>2018-04-11 13:33:51 (GMT)
commitf15fd9610b8a462b19a259b4b7ae279b9e97a77c (patch)
treeee943302800f491d8966a9b85a0e7e15e77c8ab5 /googlemock/test/gmock-generated-actions_test.cc
parentb15be9a819ee3e0a36fcc8172a00ecf41e79f230 (diff)
downloadgoogletest-f15fd9610b8a462b19a259b4b7ae279b9e97a77c.zip
googletest-f15fd9610b8a462b19a259b4b7ae279b9e97a77c.tar.gz
googletest-f15fd9610b8a462b19a259b4b7ae279b9e97a77c.tar.bz2
osx pizzas, cont
Diffstat (limited to 'googlemock/test/gmock-generated-actions_test.cc')
-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 1d685e5..6ddd57f 100644
--- a/googlemock/test/gmock-generated-actions_test.cc
+++ b/googlemock/test/gmock-generated-actions_test.cc
@@ -754,7 +754,8 @@ TEST(ActionPMacroTest, CanReferenceArgumentAndParameterTypes) {
TEST(ActionPMacroTest, WorksInCompatibleMockFunction) {
Action<std::string(const std::string& s)> a1 = Plus("tail");
const std::string re = "re";
- EXPECT_EQ("retail", a1.Perform(make_tuple(re)));
+ tuple<const std::string> dummy = make_tuple(re);
+ EXPECT_EQ("retail", a1.Perform(dummy));
}
// Tests that we can use ACTION*() to define actions overloaded on the