diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-03 15:23:54 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-03 15:23:54 (GMT) |
| commit | aa349acb07d713a70091e6372c219c8ca18f663d (patch) | |
| tree | 15cd76dc4d2fa96bd854b0740fca18bf644db8b0 /googletest/include/gtest/internal | |
| parent | 6abaa2467be2dc2261b76e91cb8e20c0aa93b8b3 (diff) | |
| download | googletest-aa349acb07d713a70091e6372c219c8ca18f663d.zip googletest-aa349acb07d713a70091e6372c219c8ca18f663d.tar.gz googletest-aa349acb07d713a70091e6372c219c8ca18f663d.tar.bz2 | |
merging, cont - 2
Diffstat (limited to 'googletest/include/gtest/internal')
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h index f7a8d9d..12c91e1 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 |