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/include/gmock/gmock-generated-function-mockers.h | |
| 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/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 |