diff options
author | 2021-02-14 11:05:57 -0500 | |
---|---|---|
committer | 2021-02-14 11:05:57 -0500 | |
commit | bc0146c2038c46f789a246d5616afd7c425157f3 (patch) | |
tree | b4d39194034b4c6e56ccd4035d25636034be43ca /src/mame/machine/mac.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/mame/machine/mac.cpp')
-rw-r--r-- | src/mame/machine/mac.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mame/machine/mac.cpp b/src/mame/machine/mac.cpp index 7395938cec4..7c5ee1b61ec 100644 --- a/src/mame/machine/mac.cpp +++ b/src/mame/machine/mac.cpp @@ -2334,7 +2334,7 @@ const char *lookup_trap(uint16_t opcode) int i; - for (i = 0; i < ARRAY_LENGTH(traps); i++) + for (i = 0; i < std::size(traps); i++) { if (traps[i].trap == opcode) return traps[i].name; @@ -2431,7 +2431,7 @@ void mac_state::mac_tracetrap(const char *cpu_name_local, int addr, int trap) csCode = *((uint16_t*) (mem + a0 + 26)); sprintf(s->state().state_int(" ioVRefNum=%i ioCRefNum=%i csCode=%i", ioVRefNum, ioCRefNum, csCode); - for (i = 0; i < ARRAY_LENGTH(cscodes); i++) + for (i = 0; i < std::size(cscodes); i++) { if (cscodes[i].csCode == csCode) { @@ -2467,7 +2467,7 @@ void mac_state::mac_tracetrap(const char *cpu_name_local, int addr, int trap) case 0xa815: /* _SCSIDispatch */ i = *((uint16_t*) (mem + a7)); - if (i < ARRAY_LENGTH(scsisels)) + if (i < std::size(scsisels)) if (scsisels[i]) sprintf(s, " (%s)", scsisels[i]); break; |