diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-04-03 10:09:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-03 10:09:08 -0400 |
| commit | 653a435f998a9870d6c2f67ff478434abf03b28e (patch) | |
| tree | b0f4c03e1b5c9d22d2d02ddd4d7e0cd6214fde39 | |
| parent | 9df719da8db305333c84937b75e933a21daac280 (diff) | |
| parent | 04d1e56bd23d4e1a1dc168f0eea96b81f6f5df40 (diff) | |
| download | googletest-653a435f998a9870d6c2f67ff478434abf03b28e.tar.gz googletest-653a435f998a9870d6c2f67ff478434abf03b28e.tar.bz2 googletest-653a435f998a9870d6c2f67ff478434abf03b28e.zip | |
Merge pull request #1537 from gennadiycivil/master
gtest-port.h merge
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h index c94ccdd5..74be06b3 100644 --- a/googletest/include/gtest/internal/gtest-port.h +++ b/googletest/include/gtest/internal/gtest-port.h @@ -651,7 +651,12 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION; // STLport, provided with the Android NDK, has neither <tr1/tuple> or <tuple>. # define GTEST_HAS_TR1_TUPLE 0 # 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.` +// 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 GTEST_LANG_CXX11 && 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. |