diff options
author | AJR <ajrhacker@users.noreply.github.com> | 2021-02-14 11:05:57 -0500 |
---|---|---|
committer | AJR <ajrhacker@users.noreply.github.com> | 2021-02-14 11:05:57 -0500 |
commit | bc0146c2038c46f789a246d5616afd7c425157f3 (patch) | |
tree | b4d39194034b4c6e56ccd4035d25636034be43ca /src/osd/modules/input | |
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/osd/modules/input')
-rw-r--r-- | src/osd/modules/input/input_common.cpp | 2 | ||||
-rw-r--r-- | src/osd/modules/input/input_common.h | 4 | ||||
-rw-r--r-- | src/osd/modules/input/input_dinput.cpp | 2 | ||||
-rw-r--r-- | src/osd/modules/input/input_dinput.h | 2 | ||||
-rw-r--r-- | src/osd/modules/input/input_rawinput.cpp | 6 | ||||
-rw-r--r-- | src/osd/modules/input/input_sdl.cpp | 8 | ||||
-rw-r--r-- | src/osd/modules/input/input_uwp.cpp | 2 | ||||
-rw-r--r-- | src/osd/modules/input/input_win32.cpp | 4 | ||||
-rw-r--r-- | src/osd/modules/input/input_x11.cpp | 4 |
9 files changed, 17 insertions, 17 deletions
diff --git a/src/osd/modules/input/input_common.cpp b/src/osd/modules/input/input_common.cpp index ab51b6bbe34..3c27f9ae276 100644 --- a/src/osd/modules/input/input_common.cpp +++ b/src/osd/modules/input/input_common.cpp @@ -193,7 +193,7 @@ key_trans_entry keyboard_trans_table::s_default_table[] = keyboard_trans_table::keyboard_trans_table() { m_table = s_default_table; - m_table_size = ARRAY_LENGTH(s_default_table); + m_table_size = std::size(s_default_table); } #else keyboard_trans_table::keyboard_trans_table() diff --git a/src/osd/modules/input/input_common.h b/src/osd/modules/input/input_common.h index b4005a6b76a..830b5154745 100644 --- a/src/osd/modules/input/input_common.h +++ b/src/osd/modules/input/input_common.h @@ -547,7 +547,7 @@ int generic_axis_get_state(void *device_internal, void *item_internal) inline static const char *default_button_name(int which) { static char buffer[20]; - snprintf(buffer, ARRAY_LENGTH(buffer), "B%d", which); + snprintf(buffer, std::size(buffer), "B%d", which); return buffer; } @@ -558,7 +558,7 @@ inline static const char *default_button_name(int which) inline static const char *default_pov_name(int which) { static char buffer[20]; - snprintf(buffer, ARRAY_LENGTH(buffer), "POV%d", which); + snprintf(buffer, std::size(buffer), "POV%d", which); return buffer; } diff --git a/src/osd/modules/input/input_dinput.cpp b/src/osd/modules/input/input_dinput.cpp index e694cd8c63c..fcee640981c 100644 --- a/src/osd/modules/input/input_dinput.cpp +++ b/src/osd/modules/input/input_dinput.cpp @@ -312,7 +312,7 @@ public: std::string name; // generate/fetch the name - snprintf(defname, ARRAY_LENGTH(defname), "Scan%03d", keynum); + snprintf(defname, std::size(defname), "Scan%03d", keynum); name = device_item_name(devinfo, keynum, defname, nullptr); // add the item to the device diff --git a/src/osd/modules/input/input_dinput.h b/src/osd/modules/input/input_dinput.h index a2b6c2edcbb..01c37250c81 100644 --- a/src/osd/modules/input/input_dinput.h +++ b/src/osd/modules/input/input_dinput.h @@ -173,7 +173,7 @@ public: char guid_string[37]; snprintf( - guid_string, ARRAY_LENGTH(guid_string), + guid_string, std::size(guid_string), "%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", guid.Data1, guid.Data2, guid.Data3, guid.Data4[0], guid.Data4[1], guid.Data4[2], diff --git a/src/osd/modules/input/input_rawinput.cpp b/src/osd/modules/input/input_rawinput.cpp index 8859de8f6e4..e023ca6eab3 100644 --- a/src/osd/modules/input/input_rawinput.cpp +++ b/src/osd/modules/input/input_rawinput.cpp @@ -82,7 +82,7 @@ public: std::wstring enum_key(int index) const { WCHAR keyname[256]; - DWORD namelen = ARRAY_LENGTH(keyname); + DWORD namelen = std::size(keyname); if (RegEnumKeyEx(m_key, index, keyname, &namelen, nullptr, nullptr, nullptr, nullptr) == ERROR_SUCCESS) return std::wstring(keyname, namelen); else @@ -653,8 +653,8 @@ protected: WCHAR keyname[100]; // generate the name - if (GetKeyNameTextW(((keynum & 0x7f) << 16) | ((keynum & 0x80) << 17), keyname, ARRAY_LENGTH(keyname)) == 0) - _snwprintf(keyname, ARRAY_LENGTH(keyname), L"Scan%03d", keynum); + if (GetKeyNameTextW(((keynum & 0x7f) << 16) | ((keynum & 0x80) << 17), keyname, std::size(keyname)) == 0) + _snwprintf(keyname, std::size(keyname), L"Scan%03d", keynum); std::string name = osd::text::from_wstring(keyname); // add the item to the device 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<int>(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<int>(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<int>(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<sdl_sixaxis_joystick_device>(machine, tempname, guid_str, *this) : devicelist()->create_device<sdl_joystick_device>(machine, tempname, guid_str, *this); diff --git a/src/osd/modules/input/input_uwp.cpp b/src/osd/modules/input/input_uwp.cpp index 6b3b8675cff..c201152b02a 100644 --- a/src/osd/modules/input/input_uwp.cpp +++ b/src/osd/modules/input/input_uwp.cpp @@ -246,7 +246,7 @@ internal: char temp[256]; if (keyname == nullptr) { - snprintf(temp, ARRAY_LENGTH(temp), "Scan%03d", keynum); + snprintf(temp, std::size(temp), "Scan%03d", keynum); keyname = temp; } diff --git a/src/osd/modules/input/input_win32.cpp b/src/osd/modules/input/input_win32.cpp index a28fb08ebed..7128cf45f14 100644 --- a/src/osd/modules/input/input_win32.cpp +++ b/src/osd/modules/input/input_win32.cpp @@ -83,8 +83,8 @@ public: TCHAR keyname[100]; // generate the name - if (GetKeyNameText(((keynum & 0x7f) << 16) | ((keynum & 0x80) << 17), keyname, ARRAY_LENGTH(keyname)) == 0) - _sntprintf(keyname, ARRAY_LENGTH(keyname), TEXT("Scan%03d"), keynum); + if (GetKeyNameText(((keynum & 0x7f) << 16) | ((keynum & 0x80) << 17), keyname, std::size(keyname)) == 0) + _sntprintf(keyname, std::size(keyname), TEXT("Scan%03d"), keynum); std::string name = osd::text::from_tstring(keyname); // add the item to the device diff --git a/src/osd/modules/input/input_x11.cpp b/src/osd/modules/input/input_x11.cpp index baa8cf2f56f..757424f3858 100644 --- a/src/osd/modules/input/input_x11.cpp +++ b/src/osd/modules/input/input_x11.cpp @@ -540,7 +540,7 @@ public: // register ourself to handle events from event manager int event_types[] = { motion_type, button_press_type, button_release_type }; osd_printf_verbose("Events types to register: motion:%d, press:%d, release:%d\n", motion_type, button_press_type, button_release_type); - x11_event_manager::instance().subscribe(event_types, ARRAY_LENGTH(event_types), this); + x11_event_manager::instance().subscribe(event_types, std::size(event_types), this); } osd_printf_verbose("Lightgun: End initialization\n"); @@ -604,7 +604,7 @@ private: { if (m_lightgun_map.initialized) { - snprintf(tempname, ARRAY_LENGTH(tempname), "NC%d", index); + snprintf(tempname, std::size(tempname), "NC%d", index); return devicelist()->create_device<x11_lightgun_device>(machine, tempname, tempname, *this); } else return nullptr; |