|
2 | 2 |
|
3 | 3 | #include <algorithm>
|
4 | 4 | #include <cmath>
|
5 |
| -#include <compare> |
6 | 5 | #include <cstdint>
|
7 | 6 | #include <functional>
|
8 | 7 | #include <limits>
|
@@ -334,18 +333,7 @@ DimensionAxis interpolate(const DimensionAxis &op0,
|
334 | 333 | Alg::merge(op0.values,
|
335 | 334 | op1.values,
|
336 | 335 | res.values,
|
337 |
| - Alg::merge_args |
338 |
| - // { Remove when clang-16 not used |
339 |
| - <std::identity, |
340 |
| - std::identity, |
341 |
| - const Data::SliceIndex Val::*, |
342 |
| - decltype(std::weak_order), |
343 |
| - decltype(one_side({}, {}, latest1)), |
344 |
| - decltype(one_side({}, {}, latest1)), |
345 |
| - Alg::Merge::always, |
346 |
| - decltype(merger)> |
347 |
| - // } |
348 |
| - {.projection = &Val::first, |
| 336 | + Alg::merge_args{.projection = &Val::first, |
349 | 337 | .transformer_1 =
|
350 | 338 | one_side(true, &DimensionAxis::Item::endPos, latest2),
|
351 | 339 | .transformer_2 = one_side(false,
|
@@ -421,18 +409,7 @@ interpolate(const SplitAxis &op0, const SplitAxis &op1, double factor)
|
421 | 409 | Alg::merge(op0.parts,
|
422 | 410 | op1.parts,
|
423 | 411 | res.parts,
|
424 |
| - Alg::merge_args |
425 |
| - // { Remove when clang-16 not used |
426 |
| - <std::identity, |
427 |
| - std::identity, |
428 |
| - const std::optional<Data::SliceIndex> PartPair::*, |
429 |
| - decltype(std::weak_order), |
430 |
| - decltype(one_side(merger({}), {}, {})), |
431 |
| - decltype(one_side(merger({}), {}, {})), |
432 |
| - Alg::Merge::always, |
433 |
| - const MergerType &> |
434 |
| - // } |
435 |
| - {.projection = &PartPair::first, |
| 412 | + Alg::merge_args{.projection = &PartPair::first, |
436 | 413 | .transformer_1 = one_side(merger(factor),
|
437 | 414 | needMerge && op1.parts.empty(),
|
438 | 415 | (op0.measure.range - op0.measure.range.min)
|
|
0 commit comments