summaryrefslogtreecommitdiffstats
path: root/src/tools/imgtool/modules.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/tools/imgtool/modules.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/tools/imgtool/modules.cpp')
-rw-r--r--src/tools/imgtool/modules.cpp12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/tools/imgtool/modules.cpp b/src/tools/imgtool/modules.cpp
index 38c94d3eb35..a42ea6be6f0 100644
--- a/src/tools/imgtool/modules.cpp
+++ b/src/tools/imgtool/modules.cpp
@@ -29,8 +29,6 @@ static void (*const modules[])(const imgtool_class *imgclass, uint32_t state, un
/* step 3: declare imgtool_create_canonical_library() */
imgtoolerr_t imgtool_create_canonical_library(bool omit_untested, std::unique_ptr<imgtool::library> &library)
{
- size_t i;
-
/* list of modules that we drop */
static const char *const irrelevant_modules[] =
{
@@ -42,14 +40,12 @@ imgtoolerr_t imgtool_create_canonical_library(bool omit_untested, std::unique_pt
return IMGTOOLERR_OUTOFMEMORY;
// create all modules
- for (i = 0; i < ARRAY_LENGTH(modules); i++)
- library->add(modules[i]);
+ for (auto &module : modules)
+ library->add(module);
// remove irrelevant modules
- for (i = 0; i < ARRAY_LENGTH(irrelevant_modules); i++)
- {
- library->unlink(irrelevant_modules[i]);
- }
+ for (auto &module : irrelevant_modules)
+ library->unlink(module);
// if we are omitting untested, go through and block out the functionality in question
if (omit_untested)