From 826656b25f62ed0a2fadc7c5dde303616e621c08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robin=20Lind=C3=A9n?= <dev@robinlinden.eu>
Date: Sat, 10 Nov 2018 15:05:55 +0100
Subject: Remove workarounds for unsupported MSVC versions

---
 googlemock/src/gmock-spec-builders.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'googlemock/src')

diff --git a/googlemock/src/gmock-spec-builders.cc b/googlemock/src/gmock-spec-builders.cc
index e8b51f6c..5db774ed 100644
--- a/googlemock/src/gmock-spec-builders.cc
+++ b/googlemock/src/gmock-spec-builders.cc
@@ -50,9 +50,9 @@
 #endif
 
 // Silence C4800 (C4800: 'int *const ': forcing value
-// to bool 'true' or 'false') for MSVC 14,15
+// to bool 'true' or 'false') for MSVC 15
 #ifdef _MSC_VER
-#if _MSC_VER <= 1900
+#if _MSC_VER == 1900
 #  pragma warning(push)
 #  pragma warning(disable:4800)
 #endif
@@ -887,7 +887,7 @@ InSequence::~InSequence() {
 }  // namespace testing
 
 #ifdef _MSC_VER
-#if _MSC_VER <= 1900
+#if _MSC_VER == 1900
 #  pragma warning(pop)
 #endif
 #endif
-- 
cgit v1.2.3