diff options
author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-14 17:48:11 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-14 17:48:11 (GMT) |
commit | 41fec5588154341b7439b538c093a85ccc65b219 (patch) | |
tree | ce6e90c822efe2fb0e8262caf950a748525832b0 /googletest/src | |
parent | 17714d65e158713c418da7b8de6ea9a6875edd1e (diff) | |
parent | 2421eff9f780729b14b1d0132bb037e36c7c0e2e (diff) | |
download | googletest-41fec5588154341b7439b538c093a85ccc65b219.zip googletest-41fec5588154341b7439b538c093a85ccc65b219.tar.gz googletest-41fec5588154341b7439b538c093a85ccc65b219.tar.bz2 |
Merge pull request #1665 from rongjiecomputer/deprecate
Disable MSVC function deprecation when using Clang
Diffstat (limited to 'googletest/src')
-rw-r--r-- | googletest/src/gtest-port.cc | 4 | ||||
-rw-r--r-- | googletest/src/gtest.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/googletest/src/gtest-port.cc b/googletest/src/gtest-port.cc index 5fbb08b..71942e5 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; diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index 2ec36fa..691d644 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -860,9 +860,9 @@ TimeInMillis GetTimeInMillis() { // (deprecated function) there. // TODO(kenton@google.com): Use GetTickCount()? Or use // SystemTimeToFileTime() - GTEST_DISABLE_MSC_WARNINGS_PUSH_(4996) + GTEST_DISABLE_MSC_DEPRECATED_PUSH_() _ftime64(&now); - GTEST_DISABLE_MSC_WARNINGS_POP_() + GTEST_DISABLE_MSC_DEPRECATED_POP_() return static_cast<TimeInMillis>(now.time) * 1000 + now.millitm; #elif GTEST_HAS_GETTIMEOFDAY_ |