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/test | |
| 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/test')
| -rw-r--r-- | googletest/test/gtest_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/googletest/test/gtest_unittest.cc b/googletest/test/gtest_unittest.cc index 46eb7b2..033bc3a 100644 --- a/googletest/test/gtest_unittest.cc +++ b/googletest/test/gtest_unittest.cc @@ -444,10 +444,10 @@ class FormatEpochTimeInMillisAsIso8601Test : public Test { virtual void SetUp() { saved_tz_ = NULL; - GTEST_DISABLE_MSC_WARNINGS_PUSH_(4996 /* getenv, strdup: deprecated */) + GTEST_DISABLE_MSC_DEPRECATED_PUSH_(/* getenv, strdup: deprecated */) if (getenv("TZ")) saved_tz_ = strdup(getenv("TZ")); - GTEST_DISABLE_MSC_WARNINGS_POP_() + GTEST_DISABLE_MSC_DEPRECATED_POP_() // Set up the time zone for FormatEpochTimeInMillisAsIso8601 to use. We // cannot use the local time zone because the function's output depends |