diff options
| author | kosak <kosak@google.com> | 2014-11-17 00:28:55 +0000 |
|---|---|---|
| committer | kosak <kosak@google.com> | 2014-11-17 00:28:55 +0000 |
| commit | 5b9cbbb16d774bfcb51572d52eda3f7319088e23 (patch) | |
| tree | 37a3062d21b4c056774ea2afe983c7050f1492be /test/gmock-generated-function-mockers_test.cc | |
| parent | 2336e9c171b5894bac98f828289f537e29691896 (diff) | |
| download | googletest-5b9cbbb16d774bfcb51572d52eda3f7319088e23.tar.gz googletest-5b9cbbb16d774bfcb51572d52eda3f7319088e23.tar.bz2 googletest-5b9cbbb16d774bfcb51572d52eda3f7319088e23.zip | |
Distinguish between C++11 language and library support for std::function, std::begin, std::end, and std::move in gtest and gmock.
Bring in gtest 694.
Diffstat (limited to 'test/gmock-generated-function-mockers_test.cc')
| -rw-r--r-- | test/gmock-generated-function-mockers_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/gmock-generated-function-mockers_test.cc b/test/gmock-generated-function-mockers_test.cc index 14dded87..18f19d8c 100644 --- a/test/gmock-generated-function-mockers_test.cc +++ b/test/gmock-generated-function-mockers_test.cc @@ -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 |