eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merging, fix OSX issue

Browse Source
This commit is contained in:
Gennadiy Civil 2018-04-12 15:45:21 -04:00
parent 092ca91072
commit dc4f5638c2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
googlemock/test/gmock-internal-utils_test.cc
View File

@ -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>

3
googlemock/test/gmock-more-actions_test.cc
View File

@ -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.