Skip to content

Commit dd42833

Browse files
committed
remove old clang codes
1 parent a0b03de commit dd42833

File tree

2 files changed

+3
-37
lines changed

2 files changed

+3
-37
lines changed

src/base/math/segmentedfunc.h

+1-12
Original file line numberDiff line numberDiff line change
@@ -58,18 +58,7 @@ template <typename T, class CRTP> struct SegmentedFunction
5858
Alg::merge(self.stops,
5959
other.stops,
6060
res.stops,
61-
Alg::merge_args
62-
// { Remove when clang-16 not used
63-
<std::identity,
64-
std::identity,
65-
double Stop::*,
66-
decltype(std::weak_order),
67-
decltype(transformer(other)),
68-
decltype(transformer(self)),
69-
Alg::Merge::always,
70-
decltype(merger)>
71-
// }
72-
{.projection = &Stop::pos,
61+
Alg::merge_args{.projection = &Stop::pos,
7362
.transformer_1 = transformer(other),
7463
.transformer_2 = transformer(self),
7564
.merger = merger});

src/chart/generator/axis.cpp

+2-25
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
#include <algorithm>
44
#include <cmath>
5-
#include <compare>
65
#include <cstdint>
76
#include <functional>
87
#include <limits>
@@ -334,18 +333,7 @@ DimensionAxis interpolate(const DimensionAxis &op0,
334333
Alg::merge(op0.values,
335334
op1.values,
336335
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,
349337
.transformer_1 =
350338
one_side(true, &DimensionAxis::Item::endPos, latest2),
351339
.transformer_2 = one_side(false,
@@ -421,18 +409,7 @@ interpolate(const SplitAxis &op0, const SplitAxis &op1, double factor)
421409
Alg::merge(op0.parts,
422410
op1.parts,
423411
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,
436413
.transformer_1 = one_side(merger(factor),
437414
needMerge && op1.parts.empty(),
438415
(op0.measure.range - op0.measure.range.min)

0 commit comments

Comments
 (0)