Skip to content

Commit 7c698a0

Browse files
Apply clang-tidy's current rules to xsimd
1 parent c136070 commit 7c698a0

8 files changed

Lines changed: 25 additions & 25 deletions

File tree

include/xsimd/arch/xsimd_avx.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1526,7 +1526,7 @@ namespace xsimd
15261526
{
15271527
_mm256_stream_pd(mem, self);
15281528
}
1529-
template <class A, class T, class = typename std::enable_if<std::is_integral<T>::value, void>::type>
1529+
template <class A, class T, class = std::enable_if_t<std::is_integral<T>::value, void>>
15301530
XSIMD_INLINE void store_stream(T* mem, batch<T, A> const& self, requires_arch<avx>) noexcept
15311531
{
15321532
_mm256_stream_si256((__m256i*)mem, self);

include/xsimd/arch/xsimd_avx2.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ namespace xsimd
231231
}
232232

233233
// load_stream
234-
template <class A, class T, class = typename std::enable_if<std::is_integral<T>::value, void>::type>
234+
template <class A, class T, class = std::enable_if_t<std::is_integral<T>::value, void>>
235235
XSIMD_INLINE batch<T, A> load_stream(T const* mem, convert<T>, requires_arch<avx2>) noexcept
236236
{
237237
return _mm256_stream_load_si256((__m256i const*)mem);
@@ -359,7 +359,7 @@ namespace xsimd
359359
XSIMD_INLINE batch<T, A> bitwise_lshift(
360360
batch<T, A> const& self, batch_constant<T, A, Vs...> shifts, requires_arch<avx2> req) noexcept
361361
{
362-
using uint_t = typename std::make_unsigned<T>::type;
362+
using uint_t = std::make_unsigned_t<T>;
363363

364364
// AVX2 only supports 16-bit shifts with a uniform bitshift value,
365365
// otherwise emulate using 32-bit shifts.

include/xsimd/arch/xsimd_avx512f.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1514,7 +1514,7 @@ namespace xsimd
15141514
}
15151515

15161516
// load_stream
1517-
template <class A, class T, class = typename std::enable_if<std::is_integral<T>::value, void>::type>
1517+
template <class A, class T, class = std::enable_if_t<std::is_integral<T>::value, void>>
15181518
XSIMD_INLINE batch<T, A> load_stream(T const* mem, convert<T>, requires_arch<avx512f>) noexcept
15191519
{
15201520
return _mm512_stream_load_si512((__m512i*)mem);
@@ -2303,7 +2303,7 @@ namespace xsimd
23032303
}
23042304

23052305
// store_stream
2306-
template <class A, class T, class = typename std::enable_if<std::is_integral<T>::value, void>::type>
2306+
template <class A, class T, class = std::enable_if_t<std::is_integral<T>::value, void>>
23072307
XSIMD_INLINE void store_stream(T* mem, batch<T, A> const& self, requires_arch<avx512f>) noexcept
23082308
{
23092309
_mm512_stream_si512((__m512i*)mem, self);
@@ -2483,7 +2483,7 @@ namespace xsimd
24832483
};
24842484

24852485
template <class T, class A, T Idx0, T Idx1, T... Idx>
2486-
struct is_pair_of_contiguous_indices<T, A, Idx0, Idx1, Idx...> : std::conditional<(Idx0 % 2 == 0) && (Idx0 + 1 == Idx1), is_pair_of_contiguous_indices<T, A, Idx...>, std::false_type>::type
2486+
struct is_pair_of_contiguous_indices<T, A, Idx0, Idx1, Idx...> : std::conditional_t<(Idx0 % 2 == 0) && (Idx0 + 1 == Idx1), is_pair_of_contiguous_indices<T, A, Idx...>, std::false_type>
24872487
{
24882488
};
24892489

include/xsimd/arch/xsimd_sse2.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ namespace xsimd
345345
XSIMD_INLINE batch<T, A> bitwise_lshift(
346346
batch<T, A> const& self, batch_constant<T, A, Vs...> shifts, requires_arch<sse2> req) noexcept
347347
{
348-
using uint_t = typename std::make_unsigned<T>::type;
348+
using uint_t = std::make_unsigned_t<T>;
349349

350350
XSIMD_IF_CONSTEXPR(utils::all_equals(shifts))
351351
{
@@ -1966,7 +1966,7 @@ namespace xsimd
19661966
{
19671967
_mm_stream_ps(mem, self);
19681968
}
1969-
template <class A, class T, class = typename std::enable_if<std::is_integral<T>::value, void>::type>
1969+
template <class A, class T, class = std::enable_if_t<std::is_integral<T>::value, void>>
19701970
XSIMD_INLINE void store_stream(T* mem, batch<T, A> const& self, requires_arch<sse2>) noexcept
19711971
{
19721972
_mm_stream_si128((__m128i*)mem, self);

include/xsimd/arch/xsimd_sse4_1.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ namespace xsimd
229229
}
230230

231231
// load_stream
232-
template <class A, class T, class = typename std::enable_if<std::is_integral<T>::value, void>::type>
232+
template <class A, class T, class = std::enable_if_t<std::is_integral<T>::value, void>>
233233
XSIMD_INLINE batch<T, A> load_stream(T const* mem, convert<T>, requires_arch<sse4_1>) noexcept
234234
{
235235
return _mm_stream_load_si128((__m128i*)mem);

include/xsimd/config/xsimd_arch.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ namespace xsimd
5151

5252
template <class T, class Ty, class... Tys>
5353
struct contains<T, Ty, Tys...>
54-
: std::conditional<std::is_same<Ty, T>::value, std::true_type,
55-
contains<T, Tys...>>::type
54+
: std::conditional_t<std::is_same<Ty, T>::value, std::true_type,
55+
contains<T, Tys...>>
5656
{
5757
};
5858

include/xsimd/config/xsimd_cpu_features_x86.hpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -138,55 +138,55 @@ namespace xsimd
138138
enum class type {};
139139
};
140140

141-
using eax_or_empty = typename std::conditional<std::is_void<eax>::value, typename m_empty_reg<0>::type, eax>::type;
142-
using ebx_or_empty = typename std::conditional<std::is_void<ebx>::value, typename m_empty_reg<1>::type, ebx>::type;
143-
using ecx_or_empty = typename std::conditional<std::is_void<ecx>::value, typename m_empty_reg<2>::type, ecx>::type;
144-
using edx_or_empty = typename std::conditional<std::is_void<edx>::value, typename m_empty_reg<3>::type, edx>::type;
141+
using eax_or_empty = std::conditional_t<std::is_void<eax>::value, typename m_empty_reg<0>::type, eax>;
142+
using ebx_or_empty = std::conditional_t<std::is_void<ebx>::value, typename m_empty_reg<1>::type, ebx>;
143+
using ecx_or_empty = std::conditional_t<std::is_void<ecx>::value, typename m_empty_reg<2>::type, ecx>;
144+
using edx_or_empty = std::conditional_t<std::is_void<edx>::value, typename m_empty_reg<3>::type, edx>;
145145

146146
public:
147-
template <eax_or_empty... bits, typename T = eax, typename std::enable_if<!std::is_void<T>::value, int>::type = 0>
147+
template <eax_or_empty... bits, typename T = eax, std::enable_if_t<!std::is_void<T>::value, int> = 0>
148148
constexpr bool all_bits_set() const noexcept
149149
{
150150
return x86_reg32_bitset<eax>::template all_bits_set<bits...>();
151151
}
152152

153-
template <eax_or_empty start, eax_or_empty end, typename T = eax, typename std::enable_if<!std::is_void<T>::value, int>::type = 0>
153+
template <eax_or_empty start, eax_or_empty end, typename T = eax, std::enable_if_t<!std::is_void<T>::value, int> = 0>
154154
constexpr x86_reg32_t get_range() const noexcept
155155
{
156156
return x86_reg32_bitset<eax>::template get_range<start, end>();
157157
}
158158

159-
template <ebx_or_empty... bits, typename T = ebx, typename std::enable_if<!std::is_void<T>::value, int>::type = 0>
159+
template <ebx_or_empty... bits, typename T = ebx, std::enable_if_t<!std::is_void<T>::value, int> = 0>
160160
constexpr bool all_bits_set() const noexcept
161161
{
162162
return x86_reg32_bitset<ebx>::template all_bits_set<bits...>();
163163
}
164164

165-
template <ebx_or_empty start, ebx_or_empty end, typename T = ebx, typename std::enable_if<!std::is_void<T>::value, int>::type = 0>
165+
template <ebx_or_empty start, ebx_or_empty end, typename T = ebx, std::enable_if_t<!std::is_void<T>::value, int> = 0>
166166
constexpr x86_reg32_t get_range() const noexcept
167167
{
168168
return x86_reg32_bitset<ebx>::template get_range<start, end>();
169169
}
170170

171-
template <ecx_or_empty... bits, typename T = ecx, typename std::enable_if<!std::is_void<T>::value, int>::type = 0>
171+
template <ecx_or_empty... bits, typename T = ecx, std::enable_if_t<!std::is_void<T>::value, int> = 0>
172172
constexpr bool all_bits_set() const noexcept
173173
{
174174
return x86_reg32_bitset<ecx>::template all_bits_set<bits...>();
175175
}
176176

177-
template <ecx_or_empty start, ecx_or_empty end, typename T = ecx, typename std::enable_if<!std::is_void<T>::value, int>::type = 0>
177+
template <ecx_or_empty start, ecx_or_empty end, typename T = ecx, std::enable_if_t<!std::is_void<T>::value, int> = 0>
178178
constexpr x86_reg32_t get_range() const noexcept
179179
{
180180
return x86_reg32_bitset<ecx>::template get_range<start, end>();
181181
}
182182

183-
template <edx_or_empty... bits, typename T = edx, typename std::enable_if<!std::is_void<T>::value, int>::type = 0>
183+
template <edx_or_empty... bits, typename T = edx, std::enable_if_t<!std::is_void<T>::value, int> = 0>
184184
constexpr bool all_bits_set() const noexcept
185185
{
186186
return x86_reg32_bitset<edx>::template all_bits_set<bits...>();
187187
}
188188

189-
template <edx_or_empty start, edx_or_empty end, typename T = edx, typename std::enable_if<!std::is_void<T>::value, int>::type = 0>
189+
template <edx_or_empty start, edx_or_empty end, typename T = edx, std::enable_if_t<!std::is_void<T>::value, int> = 0>
190190
constexpr x86_reg32_t get_range() const noexcept
191191
{
192192
return x86_reg32_bitset<edx>::template get_range<start, end>();

test/test_xsimd_api.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ struct xsimd_api_integral_types_functions
366366

367367
/* Test when T is a batch_constant only, not a scalar. */
368368
template <typename U = T>
369-
void test_bitwise_lshift_multiple(T const& vals, typename std::enable_if<!std::is_integral<U>::value, int>::type = 0)
369+
void test_bitwise_lshift_multiple(T const& vals, std::enable_if_t<!std::is_integral<U>::value, int> = 0)
370370
{
371371
#ifndef XSIMD_NO_SUPPORTED_ARCHITECTURE
372372
constexpr auto Max = static_cast<value_type>(std::numeric_limits<value_type>::digits);
@@ -389,7 +389,7 @@ struct xsimd_api_integral_types_functions
389389

390390
/* Test multiple does not make sense when T is scalar. */
391391
template <typename U = T>
392-
void test_bitwise_lshift_multiple(T const&, typename std::enable_if<std::is_integral<U>::value, int>::type = 0)
392+
void test_bitwise_lshift_multiple(T const&, std::enable_if_t<std::is_integral<U>::value, int> = 0)
393393
{
394394
}
395395

0 commit comments

Comments
 (0)