Skip to content

Commit 7cfff9e

Browse files
committed
vector_algorithms.cpp: Improve conformance by adding missing template and typename for dependent things
1 parent 48db51b commit 7cfff9e

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

stl/src/vector_algorithms.cpp

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4398,21 +4398,21 @@ namespace {
43984398
if constexpr (_Needle_length_el_magnitude >= 1) {
43994399
_Eq = _Traits::_Cmp_avx(_Data1, _Data2s0);
44004400
if constexpr (_Needle_length_el_magnitude >= 2) {
4401-
const __m256i _Data2s1 = _Traits::_Shuffle_avx<1>(_Data2s0);
4401+
const __m256i _Data2s1 = _Traits::template _Shuffle_avx<1>(_Data2s0);
44024402
_Eq = _mm256_or_si256(_Eq, _Traits::_Cmp_avx(_Data1, _Data2s1));
44034403
if constexpr (_Needle_length_el_magnitude >= 4) {
4404-
const __m256i _Data2s2 = _Traits::_Shuffle_avx<2>(_Data2s0);
4404+
const __m256i _Data2s2 = _Traits::template _Shuffle_avx<2>(_Data2s0);
44054405
_Eq = _mm256_or_si256(_Eq, _Traits::_Cmp_avx(_Data1, _Data2s2));
4406-
const __m256i _Data2s3 = _Traits::_Shuffle_avx<1>(_Data2s2);
4406+
const __m256i _Data2s3 = _Traits::template _Shuffle_avx<1>(_Data2s2);
44074407
_Eq = _mm256_or_si256(_Eq, _Traits::_Cmp_avx(_Data1, _Data2s3));
44084408
if constexpr (_Needle_length_el_magnitude >= 8) {
4409-
const __m256i _Data2s4 = _Traits::_Shuffle_avx<4>(_Data2s0);
4409+
const __m256i _Data2s4 = _Traits::template _Shuffle_avx<4>(_Data2s0);
44104410
_Eq = _mm256_or_si256(_Eq, _Traits::_Cmp_avx(_Data1, _Data2s4));
4411-
const __m256i _Data2s5 = _Traits::_Shuffle_avx<1>(_Data2s4);
4411+
const __m256i _Data2s5 = _Traits::template _Shuffle_avx<1>(_Data2s4);
44124412
_Eq = _mm256_or_si256(_Eq, _Traits::_Cmp_avx(_Data1, _Data2s5));
4413-
const __m256i _Data2s6 = _Traits::_Shuffle_avx<2>(_Data2s4);
4413+
const __m256i _Data2s6 = _Traits::template _Shuffle_avx<2>(_Data2s4);
44144414
_Eq = _mm256_or_si256(_Eq, _Traits::_Cmp_avx(_Data1, _Data2s6));
4415-
const __m256i _Data2s7 = _Traits::_Shuffle_avx<1>(_Data2s6);
4415+
const __m256i _Data2s7 = _Traits::template _Shuffle_avx<1>(_Data2s6);
44164416
_Eq = _mm256_or_si256(_Eq, _Traits::_Cmp_avx(_Data1, _Data2s7));
44174417
}
44184418
}
@@ -4429,7 +4429,8 @@ namespace {
44294429

44304430
const __m256i _Last2val = _mm256_maskload_epi32(
44314431
reinterpret_cast<const int*>(_Stop2), _Avx2_tail_mask_32(_Last2_length_el * sizeof(_Ty)));
4432-
const __m256i _Last2s0 = _Traits::_Spread_avx<_Last2_length_el_magnitude>(_Last2val, _Last2_length_el);
4432+
const __m256i _Last2s0 =
4433+
_Traits::template _Spread_avx<_Last2_length_el_magnitude>(_Last2val, _Last2_length_el);
44334434

44344435
const void* _Stop1 = _First1;
44354436
_Advance_bytes(_Stop1, _Haystack_length & ~size_t{0x1F});
@@ -6914,7 +6915,7 @@ namespace {
69146915
template <class _Traits, class _Elem>
69156916
void __stdcall _Impl(
69166917
_Elem* const _Dest, const void* _Src, size_t _Size_bits, const _Elem _Elem0, const _Elem _Elem1) noexcept {
6917-
constexpr size_t _Step_size_bits = sizeof(_Traits::_Value_type) * 8;
6918+
constexpr size_t _Step_size_bits = sizeof(typename _Traits::_Value_type) * 8;
69186919

69196920
const auto _Px0 = _Traits::_Set(_Elem0);
69206921
const auto _Px1 = _Traits::_Set(_Elem1);
@@ -6933,7 +6934,7 @@ namespace {
69336934
}
69346935

69356936
if (_Size_bits > 0) {
6936-
__assume(_Size_bits < sizeof(_Traits::_Value_type));
6937+
__assume(_Size_bits < sizeof(typename _Traits::_Value_type));
69376938
typename _Traits::_Value_type _Val;
69386939
memcpy(&_Val, _Src, sizeof(_Val));
69396940
const auto _Elems = _Traits::_Step(_Val, _Px0, _Px1);

0 commit comments

Comments
 (0)