testing msvc again

googlemock/test/gmock-actions_test.cc

@@ -43,16 +43,6 @@
 #include "gtest/gtest.h"
 #include "gtest/gtest-spi.h"
 
-// Silence C4800 (C4800: 'int *const ': forcing value
-// to bool 'true' or 'false') for MSVC 14,15
-#ifdef _MSC_VER
-#if _MSC_VER <= 1900
-#  pragma warning(push)
-#  pragma warning(disable:4800)
-#endif
-#endif
-
-
 namespace {
 
 // This list should be kept sorted.
@@ -1566,9 +1556,3 @@ TEST(MoveOnlyArgumentsTest, ReturningActions) {
 #endif  // GTEST_LANG_CXX11
 
 }  // Unnamed namespace
-
-#ifdef _MSC_VER
-#if _MSC_VER == 1900
-#  pragma warning(pop)
-#endif
-#endif

googlemock/test/gmock-more-actions_test.cc

@@ -42,6 +42,15 @@
 #include "gtest/gtest.h"
 #include "gtest/internal/gtest-linked_ptr.h"
 
+// Silence C4800 (C4800: 'int *const ': forcing value
+// to bool 'true' or 'false') for MSVC 14,15
+#ifdef _MSC_VER
+#if _MSC_VER <= 1900
+#  pragma warning(push)
+#  pragma warning(disable:4800)
+#endif
+#endif
+
 namespace testing {
 namespace gmock_more_actions_test {
 
@@ -709,3 +718,8 @@ TEST(ReturnPointeeTest, Works) {
 
 }  // namespace gmock_generated_actions_test
 }  // namespace testing
+#ifdef _MSC_VER
+#if _MSC_VER == 1900
+#  pragma warning(pop)
+#endif
+#endif