diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-01-03 14:11:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-03 14:11:38 -0500 |
| commit | ba6ecedede74521490f36b6aea08f91fdad6d201 (patch) | |
| tree | 1c7ee9c9c615aa76e8af0707d79be35ccf203377 | |
| parent | 88760a299f56a935fa41797bf471d5950cbf541e (diff) | |
| parent | a3da63d97ace56fa28a0a54e192f28b10e2e0bb0 (diff) | |
| download | googletest-ba6ecedede74521490f36b6aea08f91fdad6d201.tar.gz googletest-ba6ecedede74521490f36b6aea08f91fdad6d201.tar.bz2 googletest-ba6ecedede74521490f36b6aea08f91fdad6d201.zip | |
Merge pull request #1374 from davidben/tuple-msvc
Fix testing::Combine on MSVC 2017.
| -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 5d1b141d..8778bddd 100644 --- a/googletest/include/gtest/internal/gtest-port.h +++ b/googletest/include/gtest/internal/gtest-port.h @@ -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 |