summaryrefslogtreecommitdiffstats
path: root/googletest
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2018-04-03 15:38:30 (GMT)
committerGennadiy Civil <misterg@google.com>2018-04-03 15:38:30 (GMT)
commita2dd136578f17eaafb358242ba2e9812f01777b0 (patch)
treef2af0310107110f2c58af696150c7516424573d5 /googletest
parent1065591bdb1829e89cd150dcbd45e32b9ce01dc7 (diff)
downloadgoogletest-a2dd136578f17eaafb358242ba2e9812f01777b0.zip
googletest-a2dd136578f17eaafb358242ba2e9812f01777b0.tar.gz
googletest-a2dd136578f17eaafb358242ba2e9812f01777b0.tar.bz2
merging port, cont. 191443078refs/pull/1539/head
Diffstat (limited to 'googletest')
-rw-r--r--googletest/include/gtest/internal/gtest-port.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h
index 12c91e1..e677cd9 100644
--- a/googletest/include/gtest/internal/gtest-port.h
+++ b/googletest/include/gtest/internal/gtest-port.h
@@ -754,10 +754,12 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
# include <tr1/tuple> // NOLINT
# endif // !GTEST_HAS_RTTI && GTEST_GCC_VER_ < 40302
-# else
-// If the compiler is not GCC 4.0+, we assume the user is using a
-// spec-conforming TR1 implementation.
+// VS 2010 now has tr1 support.
+# elif _MSC_VER >= 1600
# include <tuple> // IWYU pragma: export // NOLINT
+
+# else // GTEST_USE_OWN_TR1_TUPLE
+# include <tr1/tuple> // IWYU pragma: export // NOLINT
# endif // GTEST_USE_OWN_TR1_TUPLE
#endif // GTEST_HAS_TR1_TUPLE