diff options
| author | Loo Rong Jie <loorongjie@gmail.com> | 2018-07-13 13:23:28 (GMT) |
|---|---|---|
| committer | Loo Rong Jie <loorongjie@gmail.com> | 2018-07-13 13:23:28 (GMT) |
| commit | 3a8d744030e165dc7bebf70e4fbc44831059a79b (patch) | |
| tree | 04b51c012803d2b7a22da62578a697ab09a2ca60 /googletest/src/gtest-port.cc | |
| parent | b4d4438df9479675a632b2f11125e57133822ece (diff) | |
| download | googletest-3a8d744030e165dc7bebf70e4fbc44831059a79b.zip googletest-3a8d744030e165dc7bebf70e4fbc44831059a79b.tar.gz googletest-3a8d744030e165dc7bebf70e4fbc44831059a79b.tar.bz2 | |
Disable MSVC function deprecation when using Clang
Diffstat (limited to 'googletest/src/gtest-port.cc')
| -rw-r--r-- | googletest/src/gtest-port.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/googletest/src/gtest-port.cc b/googletest/src/gtest-port.cc index f8a0ad6..2ab2d25 100644 --- a/googletest/src/gtest-port.cc +++ b/googletest/src/gtest-port.cc @@ -942,7 +942,7 @@ GTestLog::~GTestLog() { // Disable Microsoft deprecation warnings for POSIX functions called from // this class (creat, dup, dup2, and close) -GTEST_DISABLE_MSC_WARNINGS_PUSH_(4996) +GTEST_DISABLE_MSC_DEPRECATED_PUSH_() #if GTEST_HAS_STREAM_REDIRECTION @@ -1026,7 +1026,7 @@ class CapturedStream { GTEST_DISALLOW_COPY_AND_ASSIGN_(CapturedStream); }; -GTEST_DISABLE_MSC_WARNINGS_POP_() +GTEST_DISABLE_MSC_DEPRECATED_POP_() static CapturedStream* g_captured_stderr = NULL; static CapturedStream* g_captured_stdout = NULL; |