Merge pull request #1817 from DavidSchuldenfrei/1.8.x/bugFix/CompileVS2013

Fix Compile error, and warning in Visaul Studio 2013

2 files changed, 11 insertions, 1 deletions

diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h
index a7bcfc8..41d7252 100644
--- a/googlemock/include/gmock/gmock-matchers.h
+++ b/googlemock/include/gmock/gmock-matchers.h
@@ -56,11 +56,17 @@
 # include <initializer_list>  // NOLINT -- must be after gtest.h
 #endif
 
+#if _MSC_VER >= 1900
 GTEST_DISABLE_MSC_WARNINGS_PUSH_(
     4251 5046 /* class A needs to have dll-interface to be used by clients of
                  class B */
     /* Symbol involving type with internal linkage not defined */)
-
+#else //Pragma 5046 doesn't exist in version of MSC prior to 1900
+GTEST_DISABLE_MSC_WARNINGS_PUSH_(
+    4251 /* class A needs to have dll-interface to be used by clients of
+                 class B */
+    /* Symbol involving type with internal linkage not defined */)
+#endif
 namespace testing {
 
 // To implement a matcher Foo for type T, define:
diff --git a/googletest/include/gtest/gtest-printers.h b/googletest/include/gtest/gtest-printers.h
index 51865f8..71f2aae 100644
--- a/googletest/include/gtest/gtest-printers.h
+++ b/googletest/include/gtest/gtest-printers.h
@@ -983,7 +983,11 @@ struct TuplePolicy {
 
   template <size_t I>
   static typename AddReference<const typename ::std::tr1::tuple_element<
+#if defined(_MSC_VER) && _MSC_VER < 1900
+      I, Tuple>::type>::type
+#else
       static_cast<int>(I), Tuple>::type>::type
+#endif
   get(const Tuple& tuple) {
     return ::std::tr1::get<I>(tuple);
   }