90244a6aef
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 |
||
|---|---|---|
| .. | ||
| custom | ||
| gtest-death-test-internal.h | ||
| gtest-filepath.h | ||
| gtest-internal.h | ||
| gtest-linked_ptr.h | ||
| gtest-param-util-generated.h | ||
| gtest-param-util-generated.h.pump | ||
| gtest-param-util.h | ||
| gtest-port-arch.h | ||
| gtest-port.h | ||
| gtest-string.h | ||
| gtest-tuple.h | ||
| gtest-tuple.h.pump | ||
| gtest-type-util.h | ||
| gtest-type-util.h.pump | ||