gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Distinguish between C++11 language and library support for std::function, std::begin, std::end, and std::move in gtest and gmock.

Browse Source 
Bring in gtest 694.
This commit is contained in:
kosak
2014-11-17 00:28:55 +00:00
parent 2336e9c171
commit 5b9cbbb16d
6 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/gmock-generated-function-mockers_test.cc
View File

@@ -595,7 +595,7 @@ TEST(MockFunctionTest, WorksFor10Arguments) {
EXPECT_EQ(2, foo.Call(true, 'a', 0, 0, 0, 0, 0, 'b', 1, false));
}
#if GTEST_LANG_CXX11
#if GTEST_HAS_STD_FUNCTION_
TEST(MockFunctionTest, AsStdFunction) {
MockFunction<int(int)> foo;
auto call = [](const std::function<int(int)> &f, int i) {
@@ -606,7 +606,7 @@ TEST(MockFunctionTest, AsStdFunction) {
EXPECT_EQ(-1, call(foo.AsStdFunction(), 1));
EXPECT_EQ(-2, call(foo.AsStdFunction(), 2));
}
#endif // GTEST_LANG_CXX11
#endif // GTEST_HAS_STD_FUNCTION_
} // namespace gmock_generated_function_mockers_test
} // namespace testing