summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/input.cpp
diff options
context:
space:
mode:
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
commitbc0146c2038c46f789a246d5616afd7c425157f3 (patch)
treeb4d39194034b4c6e56ccd4035d25636034be43ca /src/emu/input.cpp
parent91310bcdeb7ab0ff661738b212017bf836f4e8ad (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/input.cpp')
-rw-r--r--src/emu/input.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/emu/input.cpp b/src/emu/input.cpp
index e22e443cc83..25ecd238d05 100644
--- a/src/emu/input.cpp
+++ b/src/emu/input.cpp
@@ -668,7 +668,7 @@ bool input_manager::code_pressed_once(input_code code)
// look for the code in the memory
bool curvalue = code_pressed(code);
int empty = -1;
- for (int memnum = 0; memnum < ARRAY_LENGTH(m_switch_memory); memnum++)
+ for (int memnum = 0; memnum < std::size(m_switch_memory); memnum++)
{
// were we previous pressed on the last time through here?
if (m_switch_memory[memnum] == code)
@@ -876,7 +876,7 @@ input_code input_manager::code_from_token(std::string_view _token)
// copy the token and break it into pieces
std::string token[6];
int numtokens = 0;
- while (numtokens < ARRAY_LENGTH(token))
+ while (numtokens < std::size(token))
{
// make a token up to the next underscore
std::string_view::size_type score = _token.find('_');
@@ -1327,7 +1327,7 @@ bool input_manager::map_device_to_controller(const devicemap_table_type *devicem
std::string token[2];
int numtokens = 0;
std::string_view _token = controllername;
- while (numtokens < ARRAY_LENGTH(token))
+ while (numtokens < std::size(token))
{
// make a token up to the next underscore
std::string_view::size_type score = _token.find('_');