summaryrefslogtreecommitdiffstats
path: root/googletest/include/gtest/internal/gtest-port.h
diff options
context:
space:
mode:
authorWojciech Mamrak <wmamrak@gmail.com>2017-12-07 17:20:25 (GMT)
committerGitHub <noreply@github.com>2017-12-07 17:20:25 (GMT)
commit57bb0bbbf80b006f35a249951fe2e051221173ae (patch)
tree5272a50fd90343c1c9568c5f90ab44925945bbe3 /googletest/include/gtest/internal/gtest-port.h
parent3464f76e890a7f130988ffa0196577487d582b76 (diff)
downloadgoogletest-57bb0bbbf80b006f35a249951fe2e051221173ae.zip
googletest-57bb0bbbf80b006f35a249951fe2e051221173ae.tar.gz
googletest-57bb0bbbf80b006f35a249951fe2e051221173ae.tar.bz2
Remove C4996 warning in VS2017refs/pull/1348/head
Diffstat (limited to 'googletest/include/gtest/internal/gtest-port.h')
-rw-r--r--googletest/include/gtest/internal/gtest-port.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h
index 0c36007..0a0cd1d 100644
--- a/googletest/include/gtest/internal/gtest-port.h
+++ b/googletest/include/gtest/internal/gtest-port.h
@@ -642,6 +642,9 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
# if GTEST_OS_LINUX_ANDROID && defined(_STLPORT_MAJOR)
// STLport, provided with the Android NDK, has neither <tr1/tuple> or <tuple>.
# define GTEST_HAS_TR1_TUPLE 0
+# elif defined(_MSC_VER) && (_MSC_VER >= 1910)
+// Prevent `warning C4996: 'std::tr1': warning STL4002: The non-Standard std::tr1 namespace and TR1-only machinery are deprecated and will be REMOVED.`
+# define GTEST_HAS_TR1_TUPLE 0
# else
// The user didn't tell us not to do it, so we assume it's OK.
# define GTEST_HAS_TR1_TUPLE 1