Skip to content

Commit 4166164

Browse files
MorwennMorwenn
committed
Use 'typename' instead of 'class' where possible (#66)
1 parent a57a129 commit 4166164

File tree

9 files changed

+27
-27
lines changed

9 files changed

+27
-27
lines changed

‎include/cpp-sort/adapters/hybrid_adapter.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -286,12 +286,12 @@ namespace cppsort
286286
////////////////////////////////////////////////////////////
287287
// Mechanism used to unwrap nested hybrid_adapter
288288

289-
template<template<typename...> class Flattenable, typename TypeList, typename Accumulator>
289+
template<template<typename...> typename Flattenable, typename TypeList, typename Accumulator>
290290
struct flatten_fold;
291291

292292
template<
293-
template<typename...> class Flattenable,
294-
template<typename...> class TsList, typename Front, typename... Rest,
293+
template<typename...> typename Flattenable,
294+
template<typename...> typename TsList, typename Front, typename... Rest,
295295
typename... As
296296
>
297297
struct flatten_fold<Flattenable, TsList<Front, Rest...>, hybrid_adapter_impl<As...>>
@@ -300,8 +300,8 @@ namespace cppsort
300300
};
301301

302302
template<
303-
template<typename...> class Flattenable,
304-
template<typename...> class TsList, typename... InnerTs, typename... Rest,
303+
template<typename...> typename Flattenable,
304+
template<typename...> typename TsList, typename... InnerTs, typename... Rest,
305305
typename... As
306306
>
307307
struct flatten_fold<Flattenable, TsList<Flattenable<InnerTs...>, Rest...>, hybrid_adapter_impl<As...>>
@@ -310,8 +310,8 @@ namespace cppsort
310310
};
311311

312312
template<
313-
template<typename...> class Flattenable,
314-
template<typename...> class TsList,
313+
template<typename...> typename Flattenable,
314+
template<typename...> typename TsList,
315315
typename Accumulator
316316
>
317317
struct flatten_fold<Flattenable, TsList<>, Accumulator>

‎include/cpp-sort/adapters/small_array_adapter.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@ namespace cppsort
4646
// and thus void is given
4747

4848
template<
49-
template<std::size_t> class FixedSizeSorter,
49+
template<std::size_t> typename FixedSizeSorter,
5050
typename Indices = typename detail::has_domain<
5151
fixed_sorter_traits<FixedSizeSorter>
5252
>::domain
5353
>
5454
struct small_array_adapter;
5555

5656
template<
57-
template<std::size_t> class FixedSizeSorter,
57+
template<std::size_t> typename FixedSizeSorter,
5858
std::size_t... Indices
5959
>
6060
struct small_array_adapter<FixedSizeSorter, std::index_sequence<Indices...>>:
@@ -85,7 +85,7 @@ namespace cppsort
8585
}
8686
};
8787

88-
template<template<std::size_t> class FixedSizeSorter>
88+
template<template<std::size_t> typename FixedSizeSorter>
8989
struct small_array_adapter<FixedSizeSorter, void>:
9090
fixed_sorter_traits<FixedSizeSorter>,
9191
detail::sorter_facade_fptr<
@@ -112,7 +112,7 @@ namespace cppsort
112112
// is_stable specialization
113113

114114
template<
115-
template<std::size_t> class FixedSizeSorter,
115+
template<std::size_t> typename FixedSizeSorter,
116116
typename Indices,
117117
typename T, std::size_t N,
118118
typename... Args
@@ -122,7 +122,7 @@ namespace cppsort
122122
{};
123123

124124
template<
125-
template<std::size_t> class FixedSizeSorter,
125+
template<std::size_t> typename FixedSizeSorter,
126126
typename Indices,
127127
typename T, std::size_t N,
128128
typename... Args

‎include/cpp-sort/detail/schwartz_small_array.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
namespace cppsort
2020
{
2121
template<
22-
template<std::size_t> class FixedSizeSorter,
22+
template<std::size_t> typename FixedSizeSorter,
2323
size_t... Indices
2424
>
2525
struct schwartz_adapter<
@@ -54,7 +54,7 @@ namespace cppsort
5454
}
5555
};
5656

57-
template<template<std::size_t> class FixedSizeSorter>
57+
template<template<std::size_t> typename FixedSizeSorter>
5858
struct schwartz_adapter<small_array_adapter<FixedSizeSorter, void>>:
5959
fixed_sorter_traits<FixedSizeSorter>,
6060
detail::sorter_facade_fptr<

‎include/cpp-sort/detail/ska_sort.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -932,7 +932,7 @@ namespace cppsort::detail
932932
using has_indexing_operator_t
933933
= remove_cvref_t<decltype(std::declval<T&>()[0])>;
934934

935-
template<template<typename...> class Op, typename... Args>
935+
template<template<typename...> typename Op, typename... Args>
936936
using is_index_ska_sortable = is_ska_sortable<detected_t<Op, Args...>>;
937937

938938
// A bit hackish, but I'm bad at workarounds...

‎include/cpp-sort/detail/type_traits.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ namespace cppsort::detail
6767
template<
6868
typename Default,
6969
typename AlwaysVoid,
70-
template<typename...> class Op, typename... Args
70+
template<typename...> typename Op, typename... Args
7171
>
7272
struct detector
7373
{
@@ -77,7 +77,7 @@ namespace cppsort::detail
7777

7878
template<
7979
typename Default,
80-
template<typename...> class Op,
80+
template<typename...> typename Op,
8181
typename... Args
8282
>
8383
struct detector<Default, std::void_t<Op<Args...>>, Op, Args...>
@@ -86,13 +86,13 @@ namespace cppsort::detail
8686
using type = Op<Args...>;
8787
};
8888

89-
template<template<typename...> class Op, typename... Args>
89+
template<template<typename...> typename Op, typename... Args>
9090
using is_detected = typename detector<nonesuch, void, Op, Args...>::value_t;
9191

92-
template<template<typename...> class Op, typename... Args >
92+
template<template<typename...> typename Op, typename... Args >
9393
constexpr bool is_detected_v = is_detected<Op, Args...>::value;
9494

95-
template<template<typename...> class Op, typename... Args>
95+
template<template<typename...> typename Op, typename... Args>
9696
using detected_t = typename detector<nonesuch, void, Op, Args...>::type;
9797

9898
////////////////////////////////////////////////////////////
@@ -192,17 +192,17 @@ namespace cppsort::detail
192192
//
193193
// See https://wg21.link/P2098R0
194194

195-
template<typename T, template<typename...> class Template>
195+
template<typename T, template<typename...> typename Template>
196196
struct is_specialization_of:
197197
std::false_type
198198
{};
199199

200-
template<template<typename...> class Template, typename... Args>
200+
template<template<typename...> typename Template, typename... Args>
201201
struct is_specialization_of<Template<Args...>, Template>:
202202
std::true_type
203203
{};
204204

205-
template<typename T, template<typename...> class Template>
205+
template<typename T, template<typename...> typename Template>
206206
constexpr bool is_specialization_of_v = is_specialization_of<T, Template>::value;
207207

208208
////////////////////////////////////////////////////////////

‎include/cpp-sort/fwd.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ namespace cppsort
8484
struct schwartz_adapter;
8585
template<typename Sorter>
8686
struct self_sort_adapter;
87-
template<template<std::size_t> class FixedSizeSorter, typename Indices>
87+
template<template<std::size_t> typename FixedSizeSorter, typename Indices>
8888
struct small_array_adapter;
8989
template<typename Sorter>
9090
struct split_adapter;

‎include/cpp-sort/sorter_traits.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ namespace cppsort
240240
////////////////////////////////////////////////////////////
241241
// Fixed-size sorter traits
242242

243-
template<template<std::size_t> class FixedSizeSorter>
243+
template<template<std::size_t> typename FixedSizeSorter>
244244
struct fixed_sorter_traits
245245
{
246246
// Empty for SFINAE-friendliness

‎tools/compare_fixed_size.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ struct sorter_name<sorting_network_sorter<N>>
5353
static constexpr const char* value = "sorting_network_sorter";
5454
};
5555

56-
template<template<std::size_t> class Sorter, typename Indices>
56+
template<template<std::size_t> typename Sorter, typename Indices>
5757
struct sorter_name<small_array_adapter<Sorter, Indices>>
5858
{
5959
static constexpr const char* value = sorter_name<Sorter<0u>>::value;

‎tools/count-compare-copies.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include <vector>
1212
#include <cpp-sort/sorters.h>
1313

14-
template<template<typename...> class Collection, typename T, typename Compare>
14+
template<template<typename...> typename Collection, typename T, typename Compare>
1515
using sort_f = void (*)(Collection<T>&, Compare);
1616

1717
struct compare_t

0 commit comments

Comments
 (0)