From bc0146c2038c46f789a246d5616afd7c425157f3 Mon Sep 17 00:00:00 2001 From: AJR Date: Sun, 14 Feb 2021 11:05:57 -0500 Subject: Eliminate ARRAY_LENGTH template in favor of C++17's std::size * osdcomm.h: Move definition of EQUIVALENT_ARRAY to coretmpl.h * sharc.cpp, gt64xxx.cpp, ym2413.cpp, gb_lcd.cpp, snes_ppu.cpp: Use STRUCT_MEMBER for save state registration * gio/newport.cpp, megadrive/svp.cpp, nes_ctrl/bcbattle.cpp, arm7.cpp, tms9995.cpp, pckeybrd.cpp, sa1110.cpp, sa1111.cpp, jangou_blitter.cpp, vic4567.cpp: Use std::fill(_n) instead of memset * emucore.h: Remove obsolete typedef --- src/tools/srcclean.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/tools/srcclean.cpp') diff --git a/src/tools/srcclean.cpp b/src/tools/srcclean.cpp index 055cce35784..7f52c3c6feb 100644 --- a/src/tools/srcclean.cpp +++ b/src/tools/srcclean.cpp @@ -51,7 +51,6 @@ #include "corefile.h" #include "corestr.h" -#include "osdcomm.h" #include "strformat.h" #include @@ -597,7 +596,7 @@ void cleaner_base::output_utf8(char32_t ch) void cleaner_base::commit_character(char32_t ch) { - assert(ARRAY_LENGTH(m_buffer) > m_position); + assert(std::size(m_buffer) > m_position); assert(1U <= m_code_length); assert(6U >= m_code_length); @@ -697,7 +696,7 @@ void cleaner_base::commit_character(char32_t ch) void cleaner_base::process_if_full() { - if (ARRAY_LENGTH(m_buffer) == m_position) + if (std::size(m_buffer) == m_position) { process_characters(m_buffer, m_buffer + m_position); m_position = 0U; -- cgit v1.2.3-70-g09d2