Skip to content

GitLab

Commit dc4f5638 authored by Gennadiy Civil's avatar Gennadiy Civil
Browse files 

merging, fix OSX issue
parent 092ca910
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
googlemock/test/gmock-internal-utils_test.cc
View file @ dc4f5638
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
#include "gmock/internal/gmock-internal-utils.h" #include "gmock/internal/gmock-internal-utils.h"
#include <stdlib.h> #include <stdlib.h>
#include <map> #include <map>
#include <memory>
#include <string> #include <string>
#include <sstream> #include <sstream>
#include <vector> #include <vector>
......
googlemock/test/gmock-more-actions_test.cc
View file @ dc4f5638
...@@ -379,7 +379,8 @@ TEST(InvokeMethodTest, Binary) { ...@@ -379,7 +379,8 @@ TEST(InvokeMethodTest, Binary) {
Foo foo; Foo foo;
Action<std::string(const std::string&, char)> a = Invoke(&foo, &Foo::Binary); Action<std::string(const std::string&, char)> a = Invoke(&foo, &Foo::Binary);
std::string s("Hell"); 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. // Tests using Invoke() with a ternary method.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment