mirror of
https://github.com/google/googletest.git
synced 2025-01-14 08:27:56 +08:00
more mcvs fixing
This commit is contained in:
parent
701e1e5dc1
commit
dbd206e3d9
@ -49,6 +49,14 @@
|
||||
# include <unistd.h> // NOLINT
|
||||
#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)
|
||||
#endif
|
||||
|
||||
|
||||
namespace testing {
|
||||
namespace internal {
|
||||
|
||||
@ -866,3 +874,7 @@ InSequence::~InSequence() {
|
||||
}
|
||||
|
||||
} // namespace testing
|
||||
|
||||
#ifdef _MSC_VER && _MSC_VER == 1900
|
||||
# pragma warning(pop)
|
||||
#endif
|
||||
|
Loading…
x
Reference in New Issue
Block a user