diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-04-03 15:26:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-03 15:26:44 -0400 |
| commit | ac783bd787a3009e1a9440b3f7a94ef19f84de06 (patch) | |
| tree | f2af0310107110f2c58af696150c7516424573d5 | |
| parent | 6c9d07f1123fcf408b3fb3c2e39ad41593627b36 (diff) | |
| parent | a2dd136578f17eaafb358242ba2e9812f01777b0 (diff) | |
| download | googletest-ac783bd787a3009e1a9440b3f7a94ef19f84de06.tar.gz googletest-ac783bd787a3009e1a9440b3f7a94ef19f84de06.tar.bz2 googletest-ac783bd787a3009e1a9440b3f7a94ef19f84de06.zip | |
Merge pull request #1539 from gennadiycivil/master
merging port, continue
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h index f7a8d9dd..e677cd97 100644 --- a/googletest/include/gtest/internal/gtest-port.h +++ b/googletest/include/gtest/internal/gtest-port.h @@ -720,22 +720,6 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION; # if GTEST_USE_OWN_TR1_TUPLE # include "gtest/internal/gtest-tuple.h" // IWYU pragma: export // NOLINT -# elif GTEST_ENV_HAS_STD_TUPLE_ -# include <tuple> -// C++11 puts its tuple into the ::std namespace rather than -// ::std::tr1. gtest expects tuple to live in ::std::tr1, so put it there. -// This causes undefined behavior, but supported compilers react in -// the way we intend. -namespace std { -namespace tr1 { -using ::std::get; -using ::std::make_tuple; -using ::std::tuple; -using ::std::tuple_element; -using ::std::tuple_size; -} -} - # elif GTEST_OS_SYMBIAN // On Symbian, BOOST_HAS_TR1_TUPLE causes Boost's TR1 tuple library to @@ -770,10 +754,12 @@ using ::std::tuple_size; # 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 |