summaryrefslogtreecommitdiffstats
path: root/googlemock/include/gmock/internal/gmock-port.h
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2018-01-26 16:57:58 (GMT)
committerGennadiy Civil <misterg@google.com>2018-01-26 16:57:58 (GMT)
commitfbb48a7708fc791ef25096b383791966bbf369f0 (patch)
tree06f49b8bef466973da1f715f658d9470af7aa263 /googlemock/include/gmock/internal/gmock-port.h
parentb3a2048beb0f8d6cbb2d5c95e7f639780eff5805 (diff)
downloadgoogletest-fbb48a7708fc791ef25096b383791966bbf369f0.zip
googletest-fbb48a7708fc791ef25096b383791966bbf369f0.tar.gz
googletest-fbb48a7708fc791ef25096b383791966bbf369f0.tar.bz2
Code merges
Diffstat (limited to 'googlemock/include/gmock/internal/gmock-port.h')
-rw-r--r--googlemock/include/gmock/internal/gmock-port.h18
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 63f4a68..cb37f26 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_)