Skip to content

Commit cfb881f

Browse files
committed
tryp-to-fix clang-format
1 parent d08012a commit cfb881f

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/base/alg/merge.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ template <class Proj1 = std::identity,
167167
class Transform2 = std::identity,
168168
class NeedMerge = always,
169169
class Merge = get_first>
170-
struct args
170+
struct merge_args
171171
{
172172
[[no_unique_address]] Proj1 projection_1{};
173173
[[no_unique_address]] Proj2 projection_2{};
@@ -201,7 +201,7 @@ constexpr std::ranges::in_in_out_result<It1, It2, Out> merge(
201201
It2 first2,
202202
End2 last2,
203203
Out result,
204-
args<Proj1,
204+
merge_args<Proj1,
205205
Proj2,
206206
Proj,
207207
Comp,
@@ -259,7 +259,7 @@ constexpr std::ranges::in_in_out_result<
259259
merge(R1 &&range1,
260260
R2 &&range2,
261261
Out &&result,
262-
args<Args...> &&args = {})
262+
merge_args<Args...> &&args = {})
263263
{
264264
if constexpr (std::weakly_incrementable<
265265
std::remove_cvref_t<Out>>) {
@@ -282,7 +282,7 @@ merge(R1 &&range1,
282282
}
283283

284284
using Merge::merge;
285-
template <class... Args> using merge_args = Merge::args<Args...>;
285+
using Merge::merge_args;
286286

287287
}
288288

0 commit comments

Comments
 (0)