gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS

Browse Source
This commit is contained in:
Gennadiy Civil
2017-12-09 09:41:02 -05:00
committed by GitHub
parent c5cba7d17a 59202300f1
commit 55fca1937d
6 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
googletest/include/gtest/internal/gtest-port.h
View File

@@ -641,6 +641,9 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
# if GTEST_OS_LINUX_ANDROID && defined(_STLPORT_MAJOR)
// 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.`
# 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