diff options
| author | Conor Burgess <Burgess.Conor@gmail.com> | 2018-02-12 17:35:07 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-12 17:35:07 +0000 |
| commit | f11a8f9131584cf4009eca8af8a66e920c1b7391 (patch) | |
| tree | 06cf7b6488c5980a90bcc355f186047f8b5a16c0 /googlemock/include/gmock/internal/gmock-port.h | |
| parent | 27bb844e5c31a0a67b7b4864ffb2b80ae2803882 (diff) | |
| parent | 15392f1a38fa0b8c3f13a9732e94b209069efa1c (diff) | |
| download | googletest-f11a8f9131584cf4009eca8af8a66e920c1b7391.tar.gz googletest-f11a8f9131584cf4009eca8af8a66e920c1b7391.tar.bz2 googletest-f11a8f9131584cf4009eca8af8a66e920c1b7391.zip | |
Merge branch 'master' into fix-argc
Diffstat (limited to 'googlemock/include/gmock/internal/gmock-port.h')
| -rw-r--r-- | googlemock/include/gmock/internal/gmock-port.h | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/googlemock/include/gmock/internal/gmock-port.h b/googlemock/include/gmock/internal/gmock-port.h index 63f4a680..cb37f260 100644 --- a/googlemock/include/gmock/internal/gmock-port.h +++ b/googlemock/include/gmock/internal/gmock-port.h @@ -50,15 +50,11 @@ // portability utilities to Google Test's gtest-port.h instead of // here, as Google Mock depends on Google Test. Only add a utility // here if it's truly specific to Google Mock. + #include "gtest/internal/gtest-linked_ptr.h" #include "gtest/internal/gtest-port.h" #include "gmock/internal/custom/gmock-port.h" -// To avoid conditional compilation everywhere, we make it -// gmock-port.h's responsibility to #include the header implementing -// tr1/tuple. gmock-port.h does this via gtest-port.h, which is -// guaranteed to pull in the tuple header. - // For MS Visual C++, check the compiler version. At least VS 2003 is // required to compile Google Mock. #if defined(_MSC_VER) && _MSC_VER < 1310 @@ -72,18 +68,18 @@ #if !defined(GMOCK_DECLARE_bool_) // Macros for declaring flags. -#define GMOCK_DECLARE_bool_(name) extern GTEST_API_ bool GMOCK_FLAG(name) -#define GMOCK_DECLARE_int32_(name) \ +# define GMOCK_DECLARE_bool_(name) extern GTEST_API_ bool GMOCK_FLAG(name) +# define GMOCK_DECLARE_int32_(name) \ extern GTEST_API_ ::testing::internal::Int32 GMOCK_FLAG(name) -#define GMOCK_DECLARE_string_(name) \ +# define GMOCK_DECLARE_string_(name) \ extern GTEST_API_ ::std::string GMOCK_FLAG(name) // Macros for defining flags. -#define GMOCK_DEFINE_bool_(name, default_val, doc) \ +# define GMOCK_DEFINE_bool_(name, default_val, doc) \ GTEST_API_ bool GMOCK_FLAG(name) = (default_val) -#define GMOCK_DEFINE_int32_(name, default_val, doc) \ +# define GMOCK_DEFINE_int32_(name, default_val, doc) \ GTEST_API_ ::testing::internal::Int32 GMOCK_FLAG(name) = (default_val) -#define GMOCK_DEFINE_string_(name, default_val, doc) \ +# define GMOCK_DEFINE_string_(name, default_val, doc) \ GTEST_API_ ::std::string GMOCK_FLAG(name) = (default_val) #endif // !defined(GMOCK_DECLARE_bool_) |