Homec4science

Fix testing::Combine on MSVC 2017.

Authored by David Benjamin <davidben@google.com> on Jan 2 2018, 18:55.

Description

Fix testing::Combine on MSVC 2017.

On platforms with std::tuple and not std::tr1::tuple, GTEST_HAS_COMBINE
gets turned off when it works fine (due to GTEST_TUPLE_NAMESPACE_).
Elsewhere in the project, several GTEST_HAS_TR1_TUPLE checks
additionally check GTEST_HAS_STD_TUPLE_, so use that formulation.

(The ones that don't are specific to std::tr1::tuple and are followed by
an identical GTEST_HAS_STD_TUPLE_ version underneath it.)

In particular, this fixes testing::Combine on MSVC 2017, which regressed
here:
https://github.com/google/googletest/pull/1348#issuecomment-353879010

Details

Committed
David Benjamin <davidben@google.com>Jan 2 2018, 18:57
Pushed
trottetDec 4 2019, 13:52
Parents
R9484:1c2f19070472: Merge pull request #1109 from davidben/vs2017
Branches
Unknown
Tags
Unknown

Event Timeline

David Benjamin <davidben@google.com> committed R9484:90244a6aef73: Fix testing::Combine on MSVC 2017. (authored by David Benjamin <davidben@google.com>).Jan 2 2018, 18:57