diff options
author | 2021-02-14 11:05:57 -0500 | |
---|---|---|
committer | 2021-02-14 11:05:57 -0500 | |
commit | bc0146c2038c46f789a246d5616afd7c425157f3 (patch) | |
tree | b4d39194034b4c6e56ccd4035d25636034be43ca /src/tools/imgtool/main.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/tools/imgtool/main.cpp')
-rw-r--r-- | src/tools/imgtool/main.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/tools/imgtool/main.cpp b/src/tools/imgtool/main.cpp index 360f015b233..a0a9be24054 100644 --- a/src/tools/imgtool/main.cpp +++ b/src/tools/imgtool/main.cpp @@ -97,7 +97,7 @@ static int parse_options(int argc, char *argv[], int minunnamed, int maxunnamed, if (*fork) goto optionalreadyspecified; - snprintf(buf, ARRAY_LENGTH(buf), "%s", value); + snprintf(buf, std::size(buf), "%s", value); *fork = buf; } else @@ -564,7 +564,7 @@ static int cmd_identify(const struct command *c, int argc, char *argv[]) imgtoolerr_t err; int i; - err = imgtool::image::identify_file(argv[0], modules, ARRAY_LENGTH(modules)); + err = imgtool::image::identify_file(argv[0], modules, std::size(modules)); if (err) { reporterror(err, c, nullptr, argv[0], nullptr, nullptr, nullptr); @@ -895,7 +895,7 @@ int main(int argc, char *argv[]) if (argc > 1) { /* figure out what command they are running, and run it */ - for (i = 0; i < ARRAY_LENGTH(cmds); i++) + for (i = 0; i < std::size(cmds); i++) { c = &cmds[i]; if (!core_stricmp(c->name, argv[1])) @@ -934,7 +934,7 @@ int main(int argc, char *argv[]) // Usage util::stream_format(std::wcerr, L"imgtool - Generic image manipulation tool for use with MAME\n\n"); - for (i = 0; i < ARRAY_LENGTH(cmds); i++) + for (i = 0; i < std::size(cmds); i++) { writeusage(std::wcerr, (i == 0), &cmds[i], argv); } |