diff options
| author | Abseil Team <absl-team@google.com> | 2018-12-17 18:59:00 -0500 |
|---|---|---|
| committer | Mark Barolak <mbar@google.com> | 2018-12-20 14:09:31 -0500 |
| commit | e26a3fa13ca21500773293946e92ec72f8d8c9ea (patch) | |
| tree | c69e48ca1dcbe3623903040d25b4647d70f7d3bf /googlemock/test/gmock-generated-function-mockers_test.cc | |
| parent | 9ab640ce5e5120021c5972d7e60f258bfca64d71 (diff) | |
| download | googletest-e26a3fa13ca21500773293946e92ec72f8d8c9ea.tar.gz googletest-e26a3fa13ca21500773293946e92ec72f8d8c9ea.tar.bz2 googletest-e26a3fa13ca21500773293946e92ec72f8d8c9ea.zip | |
Googletest export
Unifdef c++11-related macros from googletest now that it requires C++11.
PiperOrigin-RevId: 225905601
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()); |