Googletest export

Unifdef c++11-related macros from googletest now that it requires C++11. PiperOrigin-RevId: 225905601
2018-12-20 14:09:31 -05:00
parent 9ab640ce5e
commit e26a3fa13c
17 changed files with 30 additions and 654 deletions
@@ -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 {