Skip to content

Commit 1ad369c

Browse files
committed
Refactor Combine() to use CombineTo<R>()
1 parent eadd0e9 commit 1ad369c

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

googletest/include/gtest/gtest-param-test.h

+2-3
Original file line numberDiff line numberDiff line change
@@ -447,9 +447,8 @@ internal::ParamGenerator<R> CombineTo(
447447
template <typename... T>
448448
internal::ParamGenerator<std::tuple<T...>> Combine(
449449
internal::ParamGenerator<T>&&... generators) {
450-
return internal::ParamGenerator<std::tuple<T...>>(
451-
new internal::CartesianProductGenerator<std::tuple<T...>, T...>(
452-
std::forward<decltype(generators)>(generators)...));
450+
return CombineTo<std::tuple<T...>, T...>(
451+
std::forward<decltype(generators)>(generators)...);
453452
}
454453

455454
// ConvertGenerator() wraps a parameter generator in order to cast each produced

0 commit comments

Comments
 (0)