Updated to gmock-1.7.0

[alexxy/gromacs.git] / src / external / gmock-1.7.0 / include / gmock / internal / gmock-port.h

diff --git a/src/external/gmock-1.6.0/include/gmock/internal/gmock-port.h b/src/external/gmock-1.7.0/include/gmock/internal/gmock-port.h
similarity index 89%
rename from src/external/gmock-1.6.0/include/gmock/internal/gmock-port.h
rename to src/external/gmock-1.7.0/include/gmock/internal/gmock-port.h
index 3b9cc4792cfa03bb92941907dcadfdd008050300..b6c5c7f1f419db8097e0091f146876a9fc9295be 100644 (file)
--- a/src/external/gmock-1.6.0/include/gmock/internal/gmock-port.h
+++ b/src/external/gmock-1.7.0/include/gmock/internal/gmock-port.h
@@ -61,18 +61,18 @@
 #define GMOCK_FLAG(name) FLAGS_gmock_##name
 
 // Macros for declaring flags.
-#define GMOCK_DECLARE_bool_(name) extern bool GMOCK_FLAG(name)
+#define GMOCK_DECLARE_bool_(name) extern GTEST_API_ bool GMOCK_FLAG(name)
 #define GMOCK_DECLARE_int32_(name) \
-    extern ::testing::internal::Int32 GMOCK_FLAG(name)
+    extern GTEST_API_ ::testing::internal::Int32 GMOCK_FLAG(name)
 #define GMOCK_DECLARE_string_(name) \
-    extern ::testing::internal::String GMOCK_FLAG(name)
+    extern GTEST_API_ ::std::string GMOCK_FLAG(name)
 
 // Macros for defining flags.
 #define GMOCK_DEFINE_bool_(name, default_val, doc) \
-    bool GMOCK_FLAG(name) = (default_val)
+    GTEST_API_ bool GMOCK_FLAG(name) = (default_val)
 #define GMOCK_DEFINE_int32_(name, default_val, doc) \
-    ::testing::internal::Int32 GMOCK_FLAG(name) = (default_val)
+    GTEST_API_ ::testing::internal::Int32 GMOCK_FLAG(name) = (default_val)
 #define GMOCK_DEFINE_string_(name, default_val, doc) \
-    ::testing::internal::String GMOCK_FLAG(name) = (default_val)
+    GTEST_API_ ::std::string GMOCK_FLAG(name) = (default_val)
 
 #endif  // GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PORT_H_