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/include/gmock/gmock-generated-function-mockers.h | |
| 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/include/gmock/gmock-generated-function-mockers.h')
| -rw-r--r-- | googlemock/include/gmock/gmock-generated-function-mockers.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/googlemock/include/gmock/gmock-generated-function-mockers.h b/googlemock/include/gmock/gmock-generated-function-mockers.h index cbd7b59d..5229cc1e 100644 --- a/googlemock/include/gmock/gmock-generated-function-mockers.h +++ b/googlemock/include/gmock/gmock-generated-function-mockers.h @@ -41,15 +41,12 @@ #ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_FUNCTION_MOCKERS_H_ #define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_FUNCTION_MOCKERS_H_ +#include <functional> #include <utility> #include "gmock/gmock-spec-builders.h" #include "gmock/internal/gmock-internal-utils.h" -#if GTEST_HAS_STD_FUNCTION_ -# include <functional> -#endif - namespace testing { namespace internal { // Removes the given pointer; this is a helper for the expectation setter method |