Skip to content

GitLab

Unverified Commit ba6ecede authored by Gennadiy Civil's avatar Gennadiy Civil Committed by GitHub
Browse files

Merge pull request #1374 from davidben/tuple-msvc 

Fix testing::Combine on MSVC 2017.
parents 88760a29 a3da63d9
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
googletest/include/gtest/internal/gtest-port.h
View file @ ba6ecede
...@@ -827,7 +827,7 @@ using ::std::tuple_size; ...@@ -827,7 +827,7 @@ using ::std::tuple_size;
// Determines whether to support Combine(). // Determines whether to support Combine().
// The implementation doesn't work on Sun Studio since it doesn't // The implementation doesn't work on Sun Studio since it doesn't
// understand templated conversion operators. // 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 # define GTEST_HAS_COMBINE 1
#endif #endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment