diff options
| author | Chris <chrisjohnsonmail@gmail.com> | 2019-01-03 21:15:19 -0600 |
|---|---|---|
| committer | Chris <chrisjohnsonmail@gmail.com> | 2019-01-03 21:15:19 -0600 |
| commit | fd1c7976aee83718db9934d0f5063a52e10f5db6 (patch) | |
| tree | 81403e3fcf0190773dc3e7dbb42bb7c51795c74e /googlemock/test/gmock-generated-function-mockers_test.cc | |
| parent | 23533009b872e4cb6ae93471ff4e9280a2d51f62 (diff) | |
| parent | 0ffa5f9779fc3a1b18d4931484b46825d952821d (diff) | |
| download | googletest-fd1c7976aee83718db9934d0f5063a52e10f5db6.tar.gz googletest-fd1c7976aee83718db9934d0f5063a52e10f5db6.tar.bz2 googletest-fd1c7976aee83718db9934d0f5063a52e10f5db6.zip | |
Merge branch 'chore/fix_library_json' of https://github.com/ciband/googletest into chore/fix_library_json
Diffstat (limited to 'googlemock/test/gmock-generated-function-mockers_test.cc')
| -rw-r--r-- | googlemock/test/gmock-generated-function-mockers_test.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/googlemock/test/gmock-generated-function-mockers_test.cc b/googlemock/test/gmock-generated-function-mockers_test.cc index 79130bcf..52d9b8b8 100644 --- a/googlemock/test/gmock-generated-function-mockers_test.cc +++ b/googlemock/test/gmock-generated-function-mockers_test.cc @@ -582,7 +582,6 @@ TEST(MockFunctionTest, WorksFor10Arguments) { EXPECT_EQ(2, foo.Call(true, 'a', 0, 0, 0, 0, 0, 'b', 1, false)); } -#if GTEST_HAS_STD_FUNCTION_ TEST(MockFunctionTest, AsStdFunction) { MockFunction<int(int)> foo; auto call = [](const std::function<int(int)> &f, int i) { @@ -614,7 +613,6 @@ TEST(MockFunctionTest, AsStdFunctionWithReferenceParameter) { EXPECT_EQ(-1, call(foo.AsStdFunction(), i)); } -#endif // GTEST_HAS_STD_FUNCTION_ struct MockMethodSizes0 { MOCK_METHOD0(func, void()); |