diff options
| author | Chris Johnson <chrisjohnsonmail@gmail.com> | 2019-01-03 21:13:20 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-03 21:13:20 -0600 |
| commit | 0ffa5f9779fc3a1b18d4931484b46825d952821d (patch) | |
| tree | f31698c81378165e2fe639e93d6f54b252b1e2c2 /googlemock/include/gmock/gmock-generated-function-mockers.h.pump | |
| parent | 0c0ca90382457859785a97bea5695093d72097dd (diff) | |
| parent | 3880b13e4c0b04ca88f69b9c93da6058bd836c34 (diff) | |
| download | googletest-0ffa5f9779fc3a1b18d4931484b46825d952821d.tar.gz googletest-0ffa5f9779fc3a1b18d4931484b46825d952821d.tar.bz2 googletest-0ffa5f9779fc3a1b18d4931484b46825d952821d.zip | |
Merge branch 'master' into chore/fix_library_json
Diffstat (limited to 'googlemock/include/gmock/gmock-generated-function-mockers.h.pump')
| -rw-r--r-- | googlemock/include/gmock/gmock-generated-function-mockers.h.pump | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/googlemock/include/gmock/gmock-generated-function-mockers.h.pump b/googlemock/include/gmock/gmock-generated-function-mockers.h.pump index 73b68b9d..a5ec7387 100644 --- a/googlemock/include/gmock/gmock-generated-function-mockers.h.pump +++ b/googlemock/include/gmock/gmock-generated-function-mockers.h.pump @@ -42,15 +42,12 @@ $var n = 10 $$ The maximum arity we support. #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 { |