diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-03 13:31:10 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-03 13:31:10 (GMT) |
| commit | df5a48da0384c096b34eb70d91ad4245e0bdbb78 (patch) | |
| tree | 92e6c346204dc5362438a5121f9de079f4653b50 /googletest/include | |
| parent | 87a4cdddd09515e39e4adecbe3d6897df8d089c1 (diff) | |
| download | googletest-df5a48da0384c096b34eb70d91ad4245e0bdbb78.zip googletest-df5a48da0384c096b34eb70d91ad4245e0bdbb78.tar.gz googletest-df5a48da0384c096b34eb70d91ad4245e0bdbb78.tar.bz2 | |
Testing, gtest-port.h merge
Diffstat (limited to 'googletest/include')
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 3 |
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 c94ccdd..d6d1b9a 100644 --- a/googletest/include/gtest/internal/gtest-port.h +++ b/googletest/include/gtest/internal/gtest-port.h @@ -653,6 +653,9 @@ 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) +// libc++ doesn't support TR1. +# 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 |