Remove workarounds for unsupported MSVC versions

This commit is contained in:
Robin Lindén
2018-11-10 15:05:55 +01:00
parent de5be0eb28
commit 826656b25f
9 changed files with 19 additions and 84 deletions

View File

@@ -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