From cc51b29234c4ba0ea738b6407f39dbe732b0cfca Mon Sep 17 00:00:00 2001 From: Rubidium Date: Tue, 6 May 2025 18:13:57 +0200 Subject: [PATCH] Codechange: use std::fill_n/copy_n over MemSetT/MemCpyT --- src/blitter/8bpp_optimized.cpp | 5 ++--- src/music_gui.cpp | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/blitter/8bpp_optimized.cpp b/src/blitter/8bpp_optimized.cpp index 576b4ce579..05169ad9cf 100644 --- a/src/blitter/8bpp_optimized.cpp +++ b/src/blitter/8bpp_optimized.cpp @@ -11,7 +11,6 @@ #include "../zoom_func.h" #include "../settings_type.h" #include "../core/math_func.hpp" -#include "../core/mem_func.hpp" #include "8bpp_optimized.hpp" #include "../safeguards.h" @@ -96,7 +95,7 @@ void Blitter_8bppOptimized::Draw(Blitter::BlitterParams *bp, BlitterMode mode, Z } case BlitterMode::BlackRemap: - MemSetT(dst, 0, pixels); + std::fill_n(dst, pixels, 0); dst += pixels; break; @@ -112,7 +111,7 @@ void Blitter_8bppOptimized::Draw(Blitter::BlitterParams *bp, BlitterMode mode, Z } default: - MemCpyT(dst, src, pixels); + std::copy_n(src, pixels, dst); dst += pixels; src += pixels; break; } diff --git a/src/music_gui.cpp b/src/music_gui.cpp index 6b1ac051fd..10471b9d85 100644 --- a/src/music_gui.cpp +++ b/src/music_gui.cpp @@ -19,7 +19,6 @@ #include "gfx_func.h" #include "zoom_func.h" #include "core/random_func.hpp" -#include "core/mem_func.hpp" #include "error.h" #include "core/geometry_func.hpp" #include "string_func.h" @@ -439,7 +438,7 @@ void MusicSystem::SaveCustomPlaylist(PlaylistChoices pl) } size_t num = 0; - MemSetT(settings_pl, 0, NUM_SONGS_PLAYLIST); + std::fill_n(settings_pl, NUM_SONGS_PLAYLIST, 0); for (const auto &song : this->standard_playlists[pl]) { /* Music set indices in the settings playlist are 1-based, 0 means unused slot */