summaryrefslogtreecommitdiffstats
path: root/src/emu/rendfont.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/rendfont.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/rendfont.cpp')
-rw-r--r--src/emu/rendfont.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/emu/rendfont.cpp b/src/emu/rendfont.cpp
index 8fa59c20257..c20a7979bbc 100644
--- a/src/emu/rendfont.cpp
+++ b/src/emu/rendfont.cpp
@@ -478,7 +478,7 @@ inline render_font::glyph &render_font::get_char(char32_t chnum)
static glyph dummy_glyph;
unsigned const page(chnum / 256);
- if (page >= ARRAY_LENGTH(m_glyphs))
+ if (page >= std::size(m_glyphs))
{
if ((0 <= m_defchar) && (chnum != m_defchar))
return get_char(m_defchar);
@@ -1292,7 +1292,7 @@ bool render_font::load_bdf()
{
LOG("render_font::load_bdf: ignoring character with negative x advance\n");
}
- else if ((256 * ARRAY_LENGTH(m_glyphs)) <= encoding)
+ else if ((256 * std::size(m_glyphs)) <= encoding)
{
LOG("render_font::load_bdf: ignoring character with encoding outside range\n");
}
@@ -1505,7 +1505,7 @@ bool render_font::save_cached(const char *filename, u64 length, u32 hash)
// loop over all characters
bdc_table_entry table_entry(chartable.empty() ? nullptr : &chartable[0]);
- for (unsigned chnum = 0; chnum < (256 * ARRAY_LENGTH(m_glyphs)); chnum++)
+ for (unsigned chnum = 0; chnum < (256 * std::size(m_glyphs)); chnum++)
{
if (m_glyphs[chnum / 256] && (0 < m_glyphs[chnum / 256][chnum % 256].width))
{