diff options
Diffstat (limited to 'src/gtest-port.cc')
| -rw-r--r-- | src/gtest-port.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/gtest-port.cc b/src/gtest-port.cc index 0d06d6b..39e70bb 100644 --- a/src/gtest-port.cc +++ b/src/gtest-port.cc @@ -886,10 +886,7 @@ GTestLog::~GTestLog() { } // Disable Microsoft deprecation warnings for POSIX functions called from // this class (creat, dup, dup2, and close) -#ifdef _MSC_VER -# pragma warning(push) -# pragma warning(disable: 4996) -#endif // _MSC_VER +GTEST_DISABLE_MSC_WARNINGS_PUSH_(4996) #if GTEST_HAS_STREAM_REDIRECTION @@ -1008,9 +1005,7 @@ std::string CapturedStream::ReadEntireFile(FILE* file) { return content; } -# ifdef _MSC_VER -# pragma warning(pop) -# endif // _MSC_VER +GTEST_DISABLE_MSC_WARNINGS_POP_() static CapturedStream* g_captured_stderr = NULL; static CapturedStream* g_captured_stdout = NULL; |