diff options
author | 2021-02-14 11:05:57 -0500 | |
---|---|---|
committer | 2021-02-14 11:05:57 -0500 | |
commit | bc0146c2038c46f789a246d5616afd7c425157f3 (patch) | |
tree | b4d39194034b4c6e56ccd4035d25636034be43ca /src/emu/diimage.cpp | |
parent | 91310bcdeb7ab0ff661738b212017bf836f4e8ad (diff) |
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
Diffstat (limited to 'src/emu/diimage.cpp')
-rw-r--r-- | src/emu/diimage.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/emu/diimage.cpp b/src/emu/diimage.cpp index 0fbee95dce8..3c610e66319 100644 --- a/src/emu/diimage.cpp +++ b/src/emu/diimage.cpp @@ -130,17 +130,16 @@ void device_image_interface::interface_config_complete() //------------------------------------------------- -// find_device_type - search trough list of +// find_device_type - search through list of // device types to extract data //------------------------------------------------- const image_device_type_info *device_image_interface::find_device_type(iodevice_t type) { - int i; - for (i = 0; i < ARRAY_LENGTH(device_image_interface::m_device_info_array); i++) + for (const image_device_type_info &info : m_device_info_array) { - if (m_device_info_array[i].m_type == type) - return &m_device_info_array[i]; + if (info.m_type == type) + return &info; } return nullptr; } @@ -172,11 +171,10 @@ const char *device_image_interface::device_brieftypename(iodevice_t type) iodevice_t device_image_interface::device_typeid(const char *name) { - int i; - for (i = 0; i < ARRAY_LENGTH(device_image_interface::m_device_info_array); i++) + for (const image_device_type_info &info : m_device_info_array) { - if (!core_stricmp(name, m_device_info_array[i].m_name) || !core_stricmp(name, m_device_info_array[i].m_shortname)) - return m_device_info_array[i].m_type; + if (!core_stricmp(name, info.m_name) || !core_stricmp(name, info.m_shortname)) + return info.m_type; } return (iodevice_t)-1; } @@ -333,7 +331,7 @@ void device_image_interface::message(const char *format, ...) /* format the message */ va_start(args, format); - vsnprintf(buffer, ARRAY_LENGTH(buffer), format, args); + vsnprintf(buffer, std::size(buffer), format, args); va_end(args); /* display the popup for a standard amount of time */ |