diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-03 13:45:49 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-03 13:45:49 (GMT) |
| commit | 5beb452bbebace154128cf284efc301f3f55d603 (patch) | |
| tree | 10d0743f8b0c96e74ae6f8c5502c347750f489ca /googletest | |
| parent | b8cbd53e02b9ed954bc48257928ac9a6ef440d47 (diff) | |
| download | googletest-5beb452bbebace154128cf284efc301f3f55d603.zip googletest-5beb452bbebace154128cf284efc301f3f55d603.tar.gz googletest-5beb452bbebace154128cf284efc301f3f55d603.tar.bz2 | |
testing, merge
Diffstat (limited to 'googletest')
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h index d6d1b9a..afef50e 100644 --- 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 |