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/floptool.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/tools/floptool.cpp') diff --git a/src/tools/floptool.cpp b/src/tools/floptool.cpp index 534349e4089..4f1e0172444 100644 --- a/src/tools/floptool.cpp +++ b/src/tools/floptool.cpp @@ -131,7 +131,7 @@ void CLIB_DECL ATTR_PRINTF(1,2) logerror(const char *format, ...) va_end(arg); } -enum { FORMAT_COUNT = ARRAY_LENGTH(floppy_formats) }; +static constexpr size_t FORMAT_COUNT = std::size(floppy_formats); static floppy_image_format_t *formats[FORMAT_COUNT]; static std::vector variants; -- cgit v1.2.3-70-g09d2