diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-12 15:45:21 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-12 15:45:21 -0400 |
| commit | dc4f5638c2d0365ae464bff03ce297955e5393a9 (patch) | |
| tree | d85b9f4e1da962caad5e3be1f1da113e256f8727 /googlemock | |
| parent | 092ca91072bfca56da3f7c19d4a07f0f5074f0ba (diff) | |
| download | googletest-dc4f5638c2d0365ae464bff03ce297955e5393a9.tar.gz googletest-dc4f5638c2d0365ae464bff03ce297955e5393a9.tar.bz2 googletest-dc4f5638c2d0365ae464bff03ce297955e5393a9.zip | |
merging, fix OSX issue
Diffstat (limited to 'googlemock')
| -rw-r--r-- | googlemock/test/gmock-internal-utils_test.cc | 1 | ||||
| -rw-r--r-- | googlemock/test/gmock-more-actions_test.cc | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/googlemock/test/gmock-internal-utils_test.cc b/googlemock/test/gmock-internal-utils_test.cc index f8633df2..6c898cd2 100644 --- a/googlemock/test/gmock-internal-utils_test.cc +++ b/googlemock/test/gmock-internal-utils_test.cc @@ -36,7 +36,6 @@ #include "gmock/internal/gmock-internal-utils.h" #include <stdlib.h> #include <map> -#include <memory> #include <string> #include <sstream> #include <vector> diff --git a/googlemock/test/gmock-more-actions_test.cc b/googlemock/test/gmock-more-actions_test.cc index ed83fad4..7145a04b 100644 --- a/googlemock/test/gmock-more-actions_test.cc +++ b/googlemock/test/gmock-more-actions_test.cc @@ -379,7 +379,8 @@ TEST(InvokeMethodTest, Binary) { Foo foo; Action<std::string(const std::string&, char)> a = Invoke(&foo, &Foo::Binary); std::string s("Hell"); - EXPECT_EQ("Hello", a.Perform(make_tuple(s, 'o'))); + tuple<std::string, char> dummy = make_tuple(s, 'o'); + EXPECT_EQ("Hello", a.Perform(dummy)); } // Tests using Invoke() with a ternary method. |