mirror of
https://github.com/google/googletest.git
synced 2025-04-04 21:15:03 +00:00
Refactor Combine()
to use CombineTo<R>()
This commit is contained in:
parent
8a26410e64
commit
e1e37aa3a3
1 changed files with 2 additions and 3 deletions
|
@ -448,9 +448,8 @@ internal::ParamGenerator<R> CombineTo(
|
|||
template <typename... T>
|
||||
internal::ParamGenerator<std::tuple<T...>> Combine(
|
||||
internal::ParamGenerator<T>&&... generators) {
|
||||
return internal::ParamGenerator<std::tuple<T...>>(
|
||||
new internal::CartesianProductGenerator<std::tuple<T...>, T...>(
|
||||
std::forward<decltype(generators)>(generators)...));
|
||||
return CombineTo<std::tuple<T...>, T...>(
|
||||
std::forward<decltype(generators)>(generators)...);
|
||||
}
|
||||
|
||||
// ConvertGenerator() wraps a parameter generator in order to cast each produced
|
||||
|
|
Loading…
Add table
Reference in a new issue