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/test/gtest_unittest.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/test/gtest_unittest.cc')
| -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 39b6841..ab22031 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 |