mirror of
https://github.com/google/googletest.git
synced 2025-01-15 09:15:48 +08:00
preproc syntax ( I can never remember it)
This commit is contained in:
parent
61e8a0b10b
commit
35a709a701
@ -51,10 +51,12 @@
|
|||||||
|
|
||||||
// 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
|
||||||
|
#if _MSC_VER == 1900
|
||||||
# pragma warning(push)
|
# pragma warning(push)
|
||||||
# pragma warning(disable:4800)
|
# pragma warning(disable:4800)
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
namespace testing {
|
namespace testing {
|
||||||
namespace internal {
|
namespace internal {
|
||||||
@ -874,6 +876,8 @@ InSequence::~InSequence() {
|
|||||||
|
|
||||||
} // namespace testing
|
} // namespace testing
|
||||||
|
|
||||||
#ifdef _MSC_VER && (_MSC_VER == 1900)
|
#ifdef _MSC_VER
|
||||||
|
#if _MSC_VER == 1900
|
||||||
# pragma warning(pop)
|
# pragma warning(pop)
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user