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/osd/modules/input/input_sdl.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/osd/modules/input/input_sdl.cpp') diff --git a/src/osd/modules/input/input_sdl.cpp b/src/osd/modules/input/input_sdl.cpp index 248f720d485..102987b3094 100644 --- a/src/osd/modules/input/input_sdl.cpp +++ b/src/osd/modules/input/input_sdl.cpp @@ -786,7 +786,7 @@ public: static_cast(SDL_TEXTINPUT) }; - sdl_event_manager::instance().subscribe(event_types, ARRAY_LENGTH(event_types), this); + sdl_event_manager::instance().subscribe(event_types, std::size(event_types), this); sdl_keyboard_device *devinfo; @@ -921,7 +921,7 @@ public: static_cast(SDL_MOUSEWHEEL) }; - sdl_event_manager::instance().subscribe(event_types, ARRAY_LENGTH(event_types), this); + sdl_event_manager::instance().subscribe(event_types, std::size(event_types), this); sdl_mouse_device *devinfo; char defname[20]; @@ -1148,7 +1148,7 @@ public: static_cast(SDL_JOYBUTTONUP) }; - sdl_event_manager::instance().subscribe(event_types, ARRAY_LENGTH(event_types), this); + sdl_event_manager::instance().subscribe(event_types, std::size(event_types), this); osd_printf_verbose("Joystick: End initialization\n"); } @@ -1182,7 +1182,7 @@ private: // only map place holders if there were mappings specified if (devmap->initialized) { - snprintf(tempname, ARRAY_LENGTH(tempname), "NC%d", index); + snprintf(tempname, std::size(tempname), "NC%d", index); m_sixaxis_mode ? devicelist()->create_device(machine, tempname, guid_str, *this) : devicelist()->create_device(machine, tempname, guid_str, *this); -- cgit v1.2.3-70-g09d2