|
|
@ -51,7 +51,7 @@ |
|
|
|
|
|
|
|
|
|
|
|
// Silence C4800 (C4800: 'int *const ': forcing value
|
|
|
|
// Silence C4800 (C4800: 'int *const ': forcing value
|
|
|
|
// to bool 'true' or 'false') for MSVC 14
|
|
|
|
// to bool 'true' or 'false') for MSVC 14
|
|
|
|
#ifdef _MSC_VER && _MSC_VER == 1900 |
|
|
|
#ifdef (_MSC_VER && _MSC_VER == 1900) |
|
|
|
# pragma warning(push) |
|
|
|
# pragma warning(push) |
|
|
|
# pragma warning(disable:4800) |
|
|
|
# pragma warning(disable:4800) |
|
|
|
#endif |
|
|
|
#endif |
|
|
@ -874,6 +874,6 @@ InSequence::~InSequence() { |
|
|
|
|
|
|
|
|
|
|
|
} // namespace testing
|
|
|
|
} // namespace testing
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef _MSC_VER && _MSC_VER == 1900 |
|
|
|
#ifdef (_MSC_VER && _MSC_VER == 1900) |
|
|
|
# pragma warning(pop) |
|
|
|
# pragma warning(pop) |
|
|
|
#endif |
|
|
|
#endif |
|
|
|