Skip to content

Commit 5ba105e

Browse files
committed
[UCRT] Add some missing typename for GCC compatibility
1 parent 90fb839 commit 5ba105e

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

sdk/lib/ucrt/inc/corecrt_internal_strtox.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1329,7 +1329,7 @@ floating_point_parse_result __cdecl parse_floating_point_possible_nan(
13291329
StoredState stored_state
13301330
) throw()
13311331
{
1332-
using char_type = CharacterSource::char_type;
1332+
using char_type = typename CharacterSource::char_type;
13331333

13341334
auto restore_state = [&]()
13351335
{

sdk/lib/ucrt/internal/win_policies.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
template<typename TPolicy>
1212
static typename TPolicy::policy_type __cdecl get_win_policy(typename TPolicy::appmodel_policy_type defaultValue)
1313
{
14-
TPolicy::appmodel_policy_type appmodelPolicy = defaultValue;
14+
typename TPolicy::appmodel_policy_type appmodelPolicy = defaultValue;
1515

1616
// Secure processes cannot load the appmodel DLL, so only attempt loading
1717
// policy information if this is not a secure process.
@@ -29,10 +29,10 @@ static typename TPolicy::policy_type __cdecl get_cached_win_policy(typename TPol
2929
static long state_cache = 0;
3030
if (long const cached_state = __crt_interlocked_read(&state_cache))
3131
{
32-
return static_cast<TPolicy::policy_type>(cached_state);
32+
return static_cast<typename TPolicy::policy_type>(cached_state);
3333
}
3434

35-
TPolicy::appmodel_policy_type appmodelPolicy = defaultValue;
35+
typename TPolicy::appmodel_policy_type appmodelPolicy = defaultValue;
3636

3737
// Secure processes cannot load the appmodel DLL, so only attempt loading
3838
// policy information if this is not a secure process.
@@ -41,7 +41,7 @@ static typename TPolicy::policy_type __cdecl get_cached_win_policy(typename TPol
4141
TPolicy::appmodel_get_policy(&appmodelPolicy);
4242
}
4343

44-
TPolicy::policy_type const policyValue = TPolicy::appmodel_policy_to_policy_type(appmodelPolicy);
44+
typename TPolicy::policy_type const policyValue = TPolicy::appmodel_policy_to_policy_type(appmodelPolicy);
4545

4646
long const cached_state = _InterlockedExchange(&state_cache, static_cast<long>(policyValue));
4747
if (cached_state)

sdk/lib/ucrt/string/strnlen.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ static __forceinline size_t __cdecl common_strnlen_c(
138138
// [2] Aligned Vector Loop (Middle)
139139
__crt_simd_cleanup_guard<Isa> const simd_cleanup;
140140

141-
traits::pack_type const zero = traits::get_zero_pack();
141+
typename traits::pack_type const zero = traits::get_zero_pack();
142142

143143
size_t const middle_and_suffix_count = maximum_count - prefix_count;
144144
size_t const suffix_count = middle_and_suffix_count % traits::pack_size;
@@ -147,7 +147,7 @@ static __forceinline size_t __cdecl common_strnlen_c(
147147
Element const* const middle_last = it + middle_count;
148148
while (!last_reached<Mode>(it, middle_last))
149149
{
150-
auto const element_it = reinterpret_cast<traits::pack_type const*>(it);
150+
auto const element_it = reinterpret_cast<typename traits::pack_type const*>(it);
151151

152152
bool const element_has_terminator = traits::compute_byte_mask(traits::compare_equals(*element_it, zero)) != 0;
153153
if (element_has_terminator)

0 commit comments

Comments
 (0)