testing, merge

5beb452b · Gennadiy Civil · b8cbd53e · 5beb452b
Commit 5beb452b authored Apr 03, 2018 by Gennadiy Civil
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

gtest-port.h googletest/include/gtest/internal/gtest-port.h +1 -1

No files found.
--- a/googletest/include/gtest/internal/gtest-port.h
+++ b/googletest/include/gtest/internal/gtest-port.h
@@ -653,7 +653,7 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
 # 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
-# elif defined(_LIBCPP_VERSION)
+# elif GTEST_LANG_CXX11 && defined(_LIBCPP_VERSION)
 // libc++ doesn't support TR1.
 #  define GTEST_HAS_TR1_TUPLE 0
 # else