diff options
author | Gennadiy Civil <misterg@google.com> | 2018-04-13 09:16:40 -0400 |
---|---|---|
committer | Gennadiy Civil <misterg@google.com> | 2018-04-13 09:16:40 -0400 |
commit | 2dc576ec55aede9e8a5df571cf60d42de5a48105 (patch) | |
tree | 2dbf8c8339c104b9479bd437a3a6705760eff602 /googlemock/test/gmock-more-actions_test.cc | |
parent | f7330f9f14e8860bbec0620eb1d06f9c812cf561 (diff) | |
download | googletest-2dc576ec55aede9e8a5df571cf60d42de5a48105.tar.gz googletest-2dc576ec55aede9e8a5df571cf60d42de5a48105.tar.bz2 googletest-2dc576ec55aede9e8a5df571cf60d42de5a48105.zip |
merging
Diffstat (limited to 'googlemock/test/gmock-more-actions_test.cc')
-rw-r--r-- | googlemock/test/gmock-more-actions_test.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/googlemock/test/gmock-more-actions_test.cc b/googlemock/test/gmock-more-actions_test.cc index 911d034a..b13518aa 100644 --- a/googlemock/test/gmock-more-actions_test.cc +++ b/googlemock/test/gmock-more-actions_test.cc @@ -328,7 +328,8 @@ TEST(InvokeTest, FunctionThatTakes10Arguments) { // Tests using Invoke() with functions with parameters declared as Unused. TEST(InvokeTest, FunctionWithUnusedParameters) { Action<int(int, int, double, const std::string&)> a1 = Invoke(SumOfFirst2); - tuple<int, int, double, std::string> dummy = make_tuple(10, 2, 5.6, std::string("hi")); + tuple<int, int, double, std::string> dummy = + make_tuple(10, 2, 5.6, std::string("hi")); EXPECT_EQ(12, a1.Perform(dummy)); Action<int(int, int, bool, int*)> a2 = |