Convert usize to a strong number type

Author: kcat

al/auxeffectslot.cpp

@@ -271,9 +271,9 @@ auto EnsureEffectSlots(gsl::not_null<al::Context*> const context, usize const ne
     -> bool
 try {
     auto count = std::accumulate(context->mEffectSlotList.cbegin(),
-        context->mEffectSlotList.cend(), 0_uz,
+        context->mEffectSlotList.cend(), 0_usize,
         [](usize const cur, const EffectSlotSubList &sublist) noexcept -> usize
-        { return cur + sublist.mFreeMask.popcount().c_val; });
+        { return cur + sublist.mFreeMask.popcount(); });
 
     while(needed > count)
     {

al/buffer.cpp

@@ -184,9 +184,9 @@ constexpr auto INVALID_MAP_FLAGS = ~gsl::narrow<ALbitfieldSOFT>(AL_MAP_READ_BIT_
 [[nodiscard]]
 auto EnsureBuffers(gsl::not_null<al::Device*> const device, usize const needed) noexcept -> bool
 try {
-    auto count = std::accumulate(device->BufferList.cbegin(), device->BufferList.cend(), 0_uz,
+    auto count = std::accumulate(device->BufferList.cbegin(), device->BufferList.cend(), 0_usize,
         [](usize const cur, const BufferSubList &sublist) noexcept -> usize
-        { return cur + sublist.mFreeMask.popcount().c_val; });
+        { return cur + sublist.mFreeMask.popcount(); });
 
     while(needed > count)
     {
@@ -350,7 +350,7 @@ void LoadData(gsl::not_null<al::Context*> const context, gsl::not_null<al::Buffe
     if(blocks > std::numeric_limits<ALsizei>::max()/samplesPerBlock)
         context->throw_error(AL_OUT_OF_MEMORY,
             "Buffer size overflow, {} blocks x {} samples per block", blocks, samplesPerBlock);
-    if(blocks > std::numeric_limits<usize>::max()/bytesPerBlock)
+    if(blocks > usize::max()/bytesPerBlock)
         context->throw_error(AL_OUT_OF_MEMORY,
             "Buffer size overflow, {} frames x {} bytes per frame", blocks, bytesPerBlock);
 
@@ -364,7 +364,7 @@ void LoadData(gsl::not_null<al::Context*> const context, gsl::not_null<al::Buffe
     }
 #endif
 
-    auto const newsize = usize{blocks} * bytesPerBlock;
+    auto const newsize = std::size_t{blocks} * bytesPerBlock;
     auto const needRealloc = std::visit([ALBuf,DstType,newsize,access]<typename T>(T &datavec)
         -> bool
     {
@@ -566,7 +566,7 @@ void PrepareUserPtr(gsl::not_null<al::Context*> const context [[maybe_unused]],
     if(blocks > std::numeric_limits<ALsizei>::max()/samplesPerBlock)
         context->throw_error(AL_OUT_OF_MEMORY,
             "Buffer size overflow, {} blocks x {} samples per block", blocks, samplesPerBlock);
-    if(blocks > std::numeric_limits<usize>::max()/bytesPerBlock)
+    if(blocks > usize::max()/bytesPerBlock)
         context->throw_error(AL_OUT_OF_MEMORY,
             "Buffer size overflow, {} frames x {} bytes per frame", blocks, bytesPerBlock);
 
@@ -926,15 +926,15 @@ try {
         (albuf->mType == FmtMSADPCM) ? ((align-2u)/2u + 7u) * num_chans :
         (align * albuf->bytesFromFmt() * num_chans);
 
-    if(offset < 0 || length < 0 || gsl::narrow_cast<usize>(offset) > albuf->mOriginalSize
-        || gsl::narrow_cast<usize>(length) > albuf->mOriginalSize - gsl::narrow_cast<usize>(offset))
+    if(offset < 0 || length < 0 || usize::from(offset) > albuf->mOriginalSize
+        || usize::from(length) > albuf->mOriginalSize - usize::from(offset))
         context->throw_error(AL_INVALID_VALUE, "Invalid data sub-range {}+{} on buffer {}", offset,
             length, buffer);
-    if((gsl::narrow_cast<usize>(offset)%byte_align) != 0)
+    if((usize::from(offset)%byte_align) != 0)
         context->throw_error(AL_INVALID_VALUE,
             "Sub-range offset {} is not a multiple of frame size {} ({} unpack alignment)",
             offset, byte_align, align);
-    if((gsl::narrow_cast<usize>(length)%byte_align) != 0)
+    if((usize::from(length)%byte_align) != 0)
         context->throw_error(AL_INVALID_VALUE,
             "Sub-range length {} is not a multiple of frame size {} ({} unpack alignment)",
             length, byte_align, align);
@@ -980,12 +980,12 @@ try {
     if((unavailable&AL_MAP_PERSISTENT_BIT_SOFT))
         context->throw_error(AL_INVALID_VALUE,
             "Mapping buffer {} persistently without persistent access", buffer);
-    if(offset < 0 || length <= 0 || gsl::narrow_cast<usize>(offset) >= albuf->mOriginalSize
-        || gsl::narrow_cast<usize>(length) > albuf->mOriginalSize - gsl::narrow_cast<usize>(offset))
+    if(offset < 0 || length <= 0 || usize::from(offset) >= albuf->mOriginalSize
+        || usize::from(length) > albuf->mOriginalSize - usize::from(offset))
         context->throw_error(AL_INVALID_VALUE, "Mapping invalid range {}+{} for buffer {}", offset,
             length, buffer);
 
-    auto *const retval = std::visit([ptroff=gsl::narrow_cast<usize>(offset)](auto &datavec)
+    auto *const retval = std::visit([ptroff=gsl::narrow<std::size_t>(offset)](auto &datavec)
     { return &std::as_writable_bytes(datavec)[ptroff]; }, albuf->mData);
     albuf->mMappedAccess = access;
     albuf->mMappedOffset = offset;
@@ -1602,7 +1602,7 @@ try {
         {
             if(!buffer->mEaxXRamIsHardware)
             {
-                if(std::numeric_limits<usize>::max() - buffer->mOriginalSize < total_needed)
+                if(usize::max() - buffer->mOriginalSize < total_needed)
                     context->throw_error(AL_OUT_OF_MEMORY, "Size overflow ({} + {})",
                         buffer->mOriginalSize, total_needed);
 

al/debug.cpp

@@ -208,7 +208,7 @@ try {
         context->throw_error(AL_INVALID_VALUE, "Null message pointer");
 
     const auto msgview = (length < 0) ? std::string_view{message}
-        : std::string_view{message, gsl::narrow_cast<usize>(length)};
+        : std::string_view{message, gsl::narrow<std::size_t>(length)};
     if(msgview.size() >= MaxDebugMessageLength)
         context->throw_error(AL_INVALID_VALUE, "Debug message too long ({} >= {})", msgview.size(),
             MaxDebugMessageLength);
@@ -367,7 +367,7 @@ try {
         context->throw_error(AL_STACK_OVERFLOW_EXT, "Pushing too many debug groups");
 
     context->mDebugGroups.emplace_back(*dsource, id,
-        std::string_view{message, gsl::narrow_cast<usize>(length)});
+        std::string_view{message, gsl::narrow<std::size_t>(length)});
     auto &oldback = *(context->mDebugGroups.end()-2);
     auto &newback = context->mDebugGroups.back();
 
@@ -506,7 +506,7 @@ try {
         context->throw_error(AL_INVALID_VALUE, "Null label pointer");
 
     auto objname = (length < 0) ? std::string_view{label}
-        : std::string_view{label, gsl::narrow_cast<usize>(length)};
+        : std::string_view{label, gsl::narrow<std::size_t>(length)};
     if(objname.size() >= MaxObjectLabelLength)
         context->throw_error(AL_INVALID_VALUE, "Object label length too long ({} >= {})",
             objname.size(), MaxObjectLabelLength);

al/effect.cpp

@@ -145,9 +145,9 @@ void InitEffectParams(al::Effect *const effect, ALenum const type) noexcept
 [[nodiscard]]
 auto EnsureEffects(gsl::not_null<al::Device*> const device, usize const needed) noexcept -> bool
 try {
-    auto count = std::accumulate(device->EffectList.cbegin(), device->EffectList.cend(), 0_uz,
+    auto count = std::accumulate(device->EffectList.cbegin(), device->EffectList.cend(), 0_usize,
         [](usize const cur, const EffectSubList &sublist) noexcept -> usize
-        { return cur + sublist.mFreeMask.popcount().c_val; });
+        { return cur + sublist.mFreeMask.popcount(); });
 
     while(needed > count)
     {

al/filter.cpp

@@ -287,9 +287,9 @@ void InitFilterParams(gsl::not_null<al::Filter*> const filter, ALenum const type
 [[nodiscard]]
 auto EnsureFilters(gsl::not_null<al::Device*> const device, usize const needed) noexcept -> bool
 try {
-    auto count = std::accumulate(device->FilterList.cbegin(), device->FilterList.cend(), 0_uz,
+    auto count = std::accumulate(device->FilterList.cbegin(), device->FilterList.cend(), 0_usize,
         [](usize const cur, const FilterSubList &sublist) noexcept -> usize
-        { return cur + sublist.mFreeMask.popcount().c_val; });
+        { return cur + sublist.mFreeMask.popcount(); });
 
     while(needed > count)
     {

al/source.cpp

@@ -730,9 +730,9 @@ auto GetSourceState(gsl::not_null<al::Source*> const source, Voice const *const
 
 auto EnsureSources(gsl::not_null<al::Context*> const context, usize const needed) -> bool
 {
-    auto count = std::accumulate(context->mSourceList.cbegin(), context->mSourceList.cend(), 0_uz,
-        [](usize const cur, const SourceSubList &sublist) noexcept -> usize
-        { return cur + sublist.mFreeMask.popcount().c_val; });
+    auto count = std::accumulate(context->mSourceList.cbegin(), context->mSourceList.cend(),
+        0_usize, [](usize const cur, const SourceSubList &sublist) noexcept -> usize
+        { return cur + sublist.mFreeMask.popcount(); });
 
     try {
         while(needed > count)
@@ -783,7 +783,7 @@ void FreeSource(gsl::not_null<al::Context*> const context, gsl::not_null<al::Sou
     context->mSourceNames.erase(source->mId);
 
     auto const id = source->mId - 1;
-    auto const lidx = usize{id >> 6};
+    auto const lidx = std::size_t{id >> 6};
     auto const slidx = id & 0x3f;
 
     if(auto *const voice = GetSourceVoice(source, context))
@@ -838,7 +838,7 @@ auto LookupBuffer(std::nothrow_t, gsl::not_null<al::Device*> const device,
 
     if(lidx >= device->BufferList.size()) [[unlikely]]
         return nullptr;
-    auto &sublist = device->BufferList[gsl::narrow_cast<usize>(lidx)];
+    auto &sublist = device->BufferList[gsl::narrow_cast<std::size_t>(lidx)];
     if((sublist.mFreeMask & (1_u64 << slidx)) != 0) [[unlikely]]
         return nullptr;
     return std::to_address(std::next(sublist.mBuffers->begin(),
@@ -863,7 +863,7 @@ auto LookupFilter(std::nothrow_t, gsl::not_null<al::Device*> const device,
 
     if(lidx >= device->FilterList.size()) [[unlikely]]
         return nullptr;
-    auto &sublist = device->FilterList[gsl::narrow_cast<usize>(lidx)];
+    auto &sublist = device->FilterList[gsl::narrow_cast<std::size_t>(lidx)];
     if((sublist.mFreeMask & (1_u64 << slidx)) != 0) [[unlikely]]
         return nullptr;
     return std::to_address(std::next(sublist.mFilters->begin(),
@@ -888,7 +888,7 @@ auto LookupEffectSlot(std::nothrow_t, gsl::not_null<al::Context*> const context,
 
     if(lidx >= context->mEffectSlotList.size()) [[unlikely]]
         return nullptr;
-    auto &sublist = context->mEffectSlotList[gsl::narrow_cast<usize>(lidx)];
+    auto &sublist = context->mEffectSlotList[gsl::narrow_cast<std::size_t>(lidx)];
     if((sublist.mFreeMask & (1_u64 << slidx)) != 0) [[unlikely]]
         return nullptr;
     return std::to_address(std::next(sublist.mEffectSlots->begin(),
@@ -1464,12 +1464,12 @@ struct PairStruct { T First; U Second; };
 template<typename T, typename U>
 PairStruct(T, U) -> PairStruct<T, U>;
 
-template<typename T, usize N>
+template<typename T, std::size_t N>
 auto GetCheckers(gsl::not_null<al::Context*> const context, SourceProp const prop,
     std::span<T,N> const values)
 {
     return PairStruct{
-        [=](usize const expect) -> void
+        [=](std::size_t const expect) -> void
         {
             if(values.size() == expect) return;
             context->throw_error(AL_INVALID_ENUM, "Property {:#04x} expects {} value{}, got {}",
@@ -1999,7 +1999,7 @@ void SetProperty(const gsl::not_null<al::Source*> Source,
 
             if(sendidx >= device->NumAuxSends)
                 Context->throw_error(AL_INVALID_VALUE, "Invalid send {}", sendidx);
-            auto &send = Source->mSend[gsl::narrow_cast<usize>(sendidx)];
+            auto &send = Source->mSend[gsl::narrow_cast<std::size_t>(sendidx)];
 
             if(filterid)
             {
@@ -2048,11 +2048,11 @@ void SetProperty(const gsl::not_null<al::Source*> Source,
 }
 
 
-template<typename T, usize N>
+template<typename T, std::size_t N>
 auto GetSizeChecker(gsl::not_null<al::Context*> const context, SourceProp const prop,
     std::span<T,N> const values)
 {
-    return [=](usize const expect) -> void
+    return [=](std::size_t const expect) -> void
     {
         if(values.size() == expect) [[likely]] return;
         context->throw_error(AL_INVALID_ENUM, "Property {:#04x} expects {} value{}, got {}",
@@ -3518,7 +3518,7 @@ try {
         /* A buffer failed (invalid ID or format), or there was some other
          * unexpected error, so release the buffers we had.
          */
-        source->mQueue.resize(gsl::narrow_cast<usize>(NewListStart));
+        source->mQueue.resize(gsl::narrow_cast<std::size_t>(NewListStart));
         throw;
     }
     /* All buffers good. */
@@ -3556,7 +3556,7 @@ try {
 
     /* Make sure enough buffers have been processed to unqueue. */
     const auto bids = std::views::counted(buffers, nb);
-    auto processed = 0_uz;
+    auto processed = 0_usize;
     if(source->mState != AL_INITIAL) [[likely]]
     {
         const auto Current = std::invoke([source,context]() -> const VoiceBufferItem*
@@ -3567,7 +3567,7 @@ try {
         });
         const auto qiter = std::ranges::find(source->mQueue, Current,
             [](al::BufferQueueItem const &item) { return &item; });
-        processed = gsl::narrow_cast<usize>(std::distance(source->mQueue.begin(), qiter));
+        processed = isize{std::distance(source->mQueue.begin(), qiter)}.reinterpret_as<usize>();
     }
     if(processed < bids.size())
         context->throw_error(AL_INVALID_VALUE, "Unqueueing {} buffer{} (only {} processed)",
@@ -3576,7 +3576,7 @@ try {
     std::ranges::generate(bids, [source]() noexcept -> ALuint
     {
         auto bid = 0u;
-        if(auto *buffer = source->mQueue.front().mBuffer.get())
+        if(auto const *const buffer = source->mQueue.front().mBuffer.get())
             bid = buffer->mId;
         source->mQueue.pop_front();
         return bid;
@@ -3750,7 +3750,7 @@ void al::Source::eax_fail_unknown_receiving_fx_slot_id() {eax_fail("Unknown rece
 
 void al::Source::eax_set_sends_defaults(EaxSends& sends, const EaxFxSlotIds& ids) noexcept
 {
-    for(auto const i : std::views::iota(0_uz, usize{EAX_MAX_FXSLOTS}))
+    for(auto const i : std::views::iota(0_uz, std::size_t{EAX_MAX_FXSLOTS}))
     {
         auto& send = sends[i];
         send.guidReceivingFXSlotID = *(ids[i]);
@@ -3863,7 +3863,7 @@ void al::Source::eax5_set_active_fx_slots_defaults(EAX50ACTIVEFXSLOTS& slots) no
 
 void al::Source::eax5_set_speaker_levels_defaults(EaxSpeakerLevels& speaker_levels) noexcept
 {
-    for(auto const i : std::views::iota(0_uz, usize{eax_max_speakers}))
+    for(auto const i : std::views::iota(0_uz, std::size_t{eax_max_speakers}))
     {
         auto& speaker_level = speaker_levels[i];
         speaker_level.lSpeakerID = gsl::narrow_cast<eax_long>(EAXSPEAKER_FRONT_LEFT + i);
@@ -3968,7 +3968,7 @@ void al::Source::eax4_translate(const Eax4Props& src, Eax5Props& dst) noexcept
     //
     dst.sends = src.sends;
 
-    for(auto const i : std::views::iota(0_uz, usize{EAX_MAX_FXSLOTS}))
+    for(auto const i : std::views::iota(0_uz, std::size_t{EAX_MAX_FXSLOTS}))
         dst.sends[i].guidReceivingFXSlotID = *(eax5_fx_slot_ids[i]);
 
     // Active FX slots.
@@ -4018,7 +4018,7 @@ auto al::Source::eax_create_direct_filter_param() const noexcept -> EaxAlLowPass
         * source.mObstruction.flObstructionLFRatio;
     auto gainhf_mb = gsl::narrow_cast<float>(source.mObstruction.lObstruction);
 
-    for(const auto i : std::views::iota(0_uz, usize{EAX_MAX_FXSLOTS}))
+    for(const auto i : std::views::iota(0_uz, std::size_t{EAX_MAX_FXSLOTS}))
     {
         if(!mEaxActiveFxSlots.test(i))
             continue;
@@ -4123,7 +4123,7 @@ void al::Source::eax_update_direct_filter()
 
 void al::Source::eax_update_room_filters()
 {
-    for(const auto i : std::views::iota(0_uz, usize{EAX_MAX_FXSLOTS}))
+    for(const auto i : std::views::iota(0_uz, std::size_t{EAX_MAX_FXSLOTS}))
     {
         if(!mEaxActiveFxSlots.test(i))
             continue;
@@ -4444,7 +4444,7 @@ void al::Source::eax5_defer_speaker_levels(const EaxCall& call, EaxSpeakerLevels
 
     for(const auto &value : values)
     {
-        const auto index = gsl::narrow_cast<usize>(value.lSpeakerID - EAXSPEAKER_FRONT_LEFT);
+        const auto index = gsl::narrow_cast<std::size_t>(value.lSpeakerID-EAXSPEAKER_FRONT_LEFT);
         props[index].lLevel = value.lLevel;
     }
 }
@@ -4774,7 +4774,7 @@ void al::Source::eax_get(const EaxCall &call) const
 }
 
 void al::Source::eax_set_al_source_send(al::intrusive_ptr<al::EffectSlot> slot,
-    usize const sendidx, const EaxAlLowPassParam &filter)
+    std::size_t const sendidx, const EaxAlLowPassParam &filter)
 {
     if(sendidx >= EAX_MAX_FXSLOTS)
         return;
@@ -4819,7 +4819,7 @@ void al::Source::eax_commit_active_fx_slots()
 
     // Deactivate EFX auxiliary effect slots for inactive slots. Active slots
     // will be updated with the room filters.
-    for(const auto i : std::views::iota(0_uz, usize{EAX_MAX_FXSLOTS}))
+    for(const auto i : std::views::iota(0_uz, std::size_t{EAX_MAX_FXSLOTS}))
     {
         if(!mEaxActiveFxSlots.test(i))
             eax_set_al_source_send({}, i, EaxAlLowPassParam{1.0f, 1.0f});

al/source.h

@@ -1007,7 +1007,7 @@ struct Source {
     void eax_set(const EaxCall& call);
 
     // `alSource3i(source, AL_AUXILIARY_SEND_FILTER, ...)`
-    void eax_set_al_source_send(intrusive_ptr<EffectSlot> slot, usize sendidx,
+    void eax_set_al_source_send(intrusive_ptr<EffectSlot> slot, std::size_t sendidx,
         EaxAlLowPassParam const &filter);
 
     void eax_commit_active_fx_slots();

alc/alc.cpp

@@ -1677,7 +1677,7 @@ auto UpdateDeviceParams(gsl::not_null<al::Device*> device,
     case DevFmtAmbi3D: break;
     }
 
-    auto sample_delay = 0_uz;
+    auto sample_delay = 0_usize;
     if(auto *uhjenc = std::get_if<UhjPostProcess>(&device->mPostProcess))
         sample_delay += uhjenc->mUhjEncoder->getDelay();
 
@@ -1770,8 +1770,8 @@ auto UpdateDeviceParams(gsl::not_null<al::Device*> device,
     }
 
     /* Convert the sample delay from samples to nanosamples to nanoseconds. */
-    sample_delay = std::min(sample_delay, usize{std::numeric_limits<int>::max()});
-    device->FixedLatency += nanoseconds{seconds{sample_delay}} / device->mSampleRate;
+    sample_delay = std::min(sample_delay, i32::max().as<usize>());
+    device->FixedLatency += nanoseconds{seconds{sample_delay.c_val}} / device->mSampleRate;
     TRACE("Fixed device latency: {}ns", device->FixedLatency.count());
 
     auto mixer_mode = FPUCtl{};
@@ -2203,7 +2203,7 @@ DefineAlcAlias(alcGetString)
 
 namespace {
 auto GetIntegerv(al::Device *const device, ALCenum const param, std::span<ALCint> const values)
-    -> usize
+    -> std::size_t
 {
     Expects(!values.empty());
 
@@ -3385,7 +3385,7 @@ try {
     }
 
     backend->captureSamples(std::span{static_cast<std::byte*>(buffer),
-        usize{usamples}*dev->frameSizeFromFmt()});
+        std::size_t{usamples}*dev->frameSizeFromFmt()});
 }
 catch(al::base_exception&) {
 }