GitHub-Proxy/googletest
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/google/googletest.git synced 2025-08-05 00:10:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1374 from davidben/tuple-msvc

Browse Source 
Fix testing::Combine on MSVC 2017.
This commit is contained in:
Gennadiy Civil 2018-01-03 14:11:38 -05:00 committed by GitHub
commit ba6ecedede
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -827,7 +827,7 @@ using ::std::tuple_size;
// Determines whether to support Combine().
// The implementation doesn't work on Sun Studio since it doesn't
// understand templated conversion operators.
#if GTEST_HAS_TR1_TUPLE && !defined(__SUNPRO_CC)
#if (GTEST_HAS_TR1_TUPLE || GTEST_HAS_STD_TUPLE_) && !defined(__SUNPRO_CC)
# define GTEST_HAS_COMBINE 1
#endif