summaryrefslogtreecommitdiffstats
path: root/googlemock/src
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2018-04-10 20:18:23 (GMT)
committerGennadiy Civil <misterg@google.com>2018-04-10 20:18:23 (GMT)
commit25d8176e4fc8988367fbe3ce1a8ca0b92b79bbfa (patch)
treeb2c4ed855e4dd1c3f28230f5c3018147e3f74c57 /googlemock/src
parent39c58da187c9cd54e54560601be4b7ceef320da4 (diff)
downloadgoogletest-25d8176e4fc8988367fbe3ce1a8ca0b92b79bbfa.zip
googletest-25d8176e4fc8988367fbe3ce1a8ca0b92b79bbfa.tar.gz
googletest-25d8176e4fc8988367fbe3ce1a8ca0b92b79bbfa.tar.bz2
merging
Diffstat (limited to 'googlemock/src')
-rw-r--r--googlemock/src/gmock-spec-builders.cc17
1 files changed, 10 insertions, 7 deletions
diff --git a/googlemock/src/gmock-spec-builders.cc b/googlemock/src/gmock-spec-builders.cc
index 39a3fe7..22d002f 100644
--- a/googlemock/src/gmock-spec-builders.cc
+++ b/googlemock/src/gmock-spec-builders.cc
@@ -50,12 +50,13 @@
#endif
// Silence C4800 (C4800: 'int *const ': forcing value
-// to bool 'true' or 'false') for MSVC 14
-#ifdef _MSC_VER && _MSC_VER == 1900
-# pragma warning(push)
-# pragma warning(disable:4800)
+// 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 internal {
@@ -875,6 +876,8 @@ InSequence::~InSequence() {
} // namespace testing
-#ifdef _MSC_VER && _MSC_VER == 1900
-# pragma warning(pop)
+#ifdef _MSC_VER
+#if _MSC_VER <= 1900
+# pragma warning(pop)
+#endif
#endif