From 99e85967e6650b66a6f7e0c1d0a7c5256975326e Mon Sep 17 00:00:00 2001 From: AJR Date: Sun, 25 Sep 2022 22:14:24 -0400 Subject: device_palette_interface: Make information overrides noexcept --- src/devices/bus/gio64/newport.h | 2 +- src/devices/bus/nubus/nubus_48gc.cpp | 4 ++-- src/devices/bus/nubus/nubus_spec8.cpp | 4 ++-- src/devices/bus/nubus/nubus_specpdq.cpp | 4 ++-- src/devices/machine/acorn_vidc.cpp | 4 ++-- src/devices/machine/acorn_vidc.h | 4 ++-- src/devices/video/bt459.h | 2 +- src/devices/video/bt45x.h | 2 +- src/devices/video/bt47x.h | 2 +- src/devices/video/huc6260.h | 2 +- src/devices/video/ims_cvc.h | 4 ++-- src/devices/video/mc6845.h | 2 +- src/devices/video/nereid.h | 2 +- src/devices/video/pc_vga.h | 2 +- src/devices/video/psx.h | 2 +- src/devices/video/snes_ppu.h | 4 ++-- src/devices/video/tlc34076.h | 2 +- src/devices/video/tms9928a.h | 2 +- src/devices/video/v9938.h | 2 +- src/devices/video/vic4567.h | 2 +- src/emu/dipalette.h | 16 ++++++++-------- src/emu/emupal.h | 8 ++++---- src/mame/agat/agat7.h | 2 +- src/mame/agat/agat9.h | 2 +- src/mame/apple/apple2video.cpp | 2 +- src/mame/apple/apple2video.h | 2 +- src/mame/atari/atarist_v.h | 4 ++-- src/mame/atari/tia.h | 2 +- src/mame/dataeast/deco_ace.h | 2 +- src/mame/dataeast/decrmc3.h | 4 ++-- src/mame/kaneko/kaneko_grap2.h | 2 +- src/mame/namco/namco_c116.h | 4 ++-- src/mame/namco/ygv608.h | 2 +- src/mame/sgi/sgi_xmap2.h | 2 +- src/mame/shared/alpha68k_palette.h | 2 +- src/mame/shared/mega32x.h | 2 +- src/mame/taito/tc0110pcr.h | 2 +- 37 files changed, 57 insertions(+), 57 deletions(-) diff --git a/src/devices/bus/gio64/newport.h b/src/devices/bus/gio64/newport.h index 101ca7a6e61..00a6e36e22d 100644 --- a/src/devices/bus/gio64/newport.h +++ b/src/devices/bus/gio64/newport.h @@ -102,7 +102,7 @@ private: virtual void device_reset() override; // device_palette_interface overrides - virtual uint32_t palette_entries() const override { return 0x2000; } + virtual uint32_t palette_entries() const noexcept override { return 0x2000; } // Initializers void set_revision(uint32_t revision) { m_revision = revision; } diff --git a/src/devices/bus/nubus/nubus_48gc.cpp b/src/devices/bus/nubus/nubus_48gc.cpp index 60a28c513e6..9237b893150 100644 --- a/src/devices/bus/nubus/nubus_48gc.cpp +++ b/src/devices/bus/nubus/nubus_48gc.cpp @@ -99,7 +99,7 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // palette implementation - uint32_t palette_entries() const override; + uint32_t palette_entries() const noexcept override; private: static constexpr offs_t VRAM_MAX = 0x10'0000 / 4; // chip supports 2M but card can only use 1M @@ -309,7 +309,7 @@ ioport_constructor nubus_824gc_device::device_input_ports() const // palette_entries - entries in color palette //------------------------------------------------- -uint32_t jmfb_device::palette_entries() const +uint32_t jmfb_device::palette_entries() const noexcept { return 256; } diff --git a/src/devices/bus/nubus/nubus_spec8.cpp b/src/devices/bus/nubus/nubus_spec8.cpp index 1e55c907928..e85430b0f17 100644 --- a/src/devices/bus/nubus/nubus_spec8.cpp +++ b/src/devices/bus/nubus/nubus_spec8.cpp @@ -94,7 +94,7 @@ protected: virtual ioport_constructor device_input_ports() const override; // palette implementation - virtual uint32_t palette_entries() const override; + virtual uint32_t palette_entries() const noexcept override; TIMER_CALLBACK_MEMBER(vbl_tick); @@ -184,7 +184,7 @@ ioport_constructor nubus_spec8s3_device::device_input_ports() const // palette_entries - entries in color palette //------------------------------------------------- -uint32_t nubus_spec8s3_device::palette_entries() const +uint32_t nubus_spec8s3_device::palette_entries() const noexcept { return 256; } diff --git a/src/devices/bus/nubus/nubus_specpdq.cpp b/src/devices/bus/nubus/nubus_specpdq.cpp index c6b71b7b1f1..c496fa77d05 100644 --- a/src/devices/bus/nubus/nubus_specpdq.cpp +++ b/src/devices/bus/nubus/nubus_specpdq.cpp @@ -78,7 +78,7 @@ protected: virtual ioport_constructor device_input_ports() const override; // palette implementation - virtual uint32_t palette_entries() const override; + virtual uint32_t palette_entries() const noexcept override; TIMER_CALLBACK_MEMBER(vbl_tick); @@ -171,7 +171,7 @@ ioport_constructor nubus_specpdq_device::device_input_ports() const // palette_entries - entries in color palette //------------------------------------------------- -uint32_t nubus_specpdq_device::palette_entries() const +uint32_t nubus_specpdq_device::palette_entries() const noexcept { return 256; } diff --git a/src/devices/machine/acorn_vidc.cpp b/src/devices/machine/acorn_vidc.cpp index 856106d8fc1..9440c339711 100644 --- a/src/devices/machine/acorn_vidc.cpp +++ b/src/devices/machine/acorn_vidc.cpp @@ -119,7 +119,7 @@ void acorn_vidc10_device::device_add_mconfig(machine_config &config) } } -u32 acorn_vidc10_device::palette_entries() const +u32 acorn_vidc10_device::palette_entries() const noexcept { return 0x100+0x10+4; // 8bpp + 1/2/4bpp + 2bpp for cursor } @@ -605,7 +605,7 @@ void arm_vidc20_device::device_config_complete() screen().set_screen_update(*this, FUNC(arm_vidc20_device::screen_update)); } -u32 arm_vidc20_device::palette_entries() const +u32 arm_vidc20_device::palette_entries() const noexcept { return 0x100+4; // 8bpp + 2bpp for cursor } diff --git a/src/devices/machine/acorn_vidc.h b/src/devices/machine/acorn_vidc.h index 10584dddead..f2009b255b2 100644 --- a/src/devices/machine/acorn_vidc.h +++ b/src/devices/machine/acorn_vidc.h @@ -54,7 +54,7 @@ protected: // device-level overrides //virtual void device_validity_check(validity_checker &valid) const override; virtual void device_add_mconfig(machine_config &config) override; - virtual u32 palette_entries() const override; + virtual u32 palette_entries() const noexcept override; virtual void device_config_complete() override; virtual void device_start() override; virtual void device_reset() override; @@ -160,7 +160,7 @@ public: protected: virtual void device_add_mconfig(machine_config &config) override; void regs_map(address_map &map); - virtual u32 palette_entries() const override; + virtual u32 palette_entries() const noexcept override; virtual void device_start() override; virtual void device_reset() override; virtual void device_config_complete() override; diff --git a/src/devices/video/bt459.h b/src/devices/video/bt459.h index 3d945469478..2d525383378 100644 --- a/src/devices/video/bt459.h +++ b/src/devices/video/bt459.h @@ -197,7 +197,7 @@ protected: virtual void device_start() override; virtual void device_reset() override; - virtual u32 palette_entries() const override { return BT459_PIXEL_COLORS + BT459_OVERLAY_COLORS + BT459_CURSOR_COLORS; } + virtual u32 palette_entries() const noexcept override { return BT459_PIXEL_COLORS + BT459_OVERLAY_COLORS + BT459_CURSOR_COLORS; } private: // helper functions diff --git a/src/devices/video/bt45x.h b/src/devices/video/bt45x.h index 7a6793ff677..33cd63abd56 100644 --- a/src/devices/video/bt45x.h +++ b/src/devices/video/bt45x.h @@ -84,7 +84,7 @@ protected: virtual void device_start() override; - virtual u32 palette_entries() const override { return m_palette_colors + m_overlay_colors; } + virtual u32 palette_entries() const noexcept override { return m_palette_colors + m_overlay_colors; } virtual u8 palette_r(address_space &space) override; virtual void palette_w(u8 data) override; diff --git a/src/devices/video/bt47x.h b/src/devices/video/bt47x.h index cc96fed7a7b..a51fe2c3df8 100644 --- a/src/devices/video/bt47x.h +++ b/src/devices/video/bt47x.h @@ -23,7 +23,7 @@ protected: virtual void device_start() override; // device_palette_interface overrides - virtual u32 palette_entries() const override { return m_palette_colors + m_overlay_colors; } + virtual u32 palette_entries() const noexcept override { return m_palette_colors + m_overlay_colors; } // read/write handlers u8 address_r(); diff --git a/src/devices/video/huc6260.h b/src/devices/video/huc6260.h index 387bc6cd7f7..01b1a299f45 100644 --- a/src/devices/video/huc6260.h +++ b/src/devices/video/huc6260.h @@ -44,7 +44,7 @@ protected: virtual void device_start() override; virtual void device_reset() override; - virtual uint32_t palette_entries() const override { return PALETTE_SIZE; } + virtual uint32_t palette_entries() const noexcept override { return PALETTE_SIZE; } TIMER_CALLBACK_MEMBER(update_events); diff --git a/src/devices/video/ims_cvc.h b/src/devices/video/ims_cvc.h index 0772ef150de..094391e23cf 100644 --- a/src/devices/video/ims_cvc.h +++ b/src/devices/video/ims_cvc.h @@ -31,7 +31,7 @@ protected: virtual void device_reset() override; // device_palette_interface overrides - virtual u32 palette_entries() const override { return 256; } + virtual u32 palette_entries() const noexcept override { return 256; } virtual void boot_w(u32 data) { m_boot = data & MASK24; } @@ -176,7 +176,7 @@ protected: virtual void device_reset() override; // device_palette_interface overrides - virtual u32 palette_entries() const override { return 256 + 3; } + virtual u32 palette_entries() const noexcept override { return 256 + 3; } virtual void microport_map(address_map &map); diff --git a/src/devices/video/mc6845.h b/src/devices/video/mc6845.h index 1d8b61fa949..1208c057bb6 100644 --- a/src/devices/video/mc6845.h +++ b/src/devices/video/mc6845.h @@ -428,7 +428,7 @@ protected: virtual space_config_vector memory_space_config() const override; // device_palette_interface overrides - virtual uint32_t palette_entries() const override { return 16; } + virtual uint32_t palette_entries() const noexcept override { return 16; } TIMER_CALLBACK_MEMBER(block_copy_tick); diff --git a/src/devices/video/nereid.h b/src/devices/video/nereid.h index c1e2b96ea2b..18717de2b22 100644 --- a/src/devices/video/nereid.h +++ b/src/devices/video/nereid.h @@ -19,7 +19,7 @@ protected: nereid_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); virtual void device_start() override; virtual void device_reset() override; - virtual u32 palette_entries() const override { return 0x200; } + virtual u32 palette_entries() const noexcept override { return 0x200; } private: static constexpr int NEREID_BUSY=1; diff --git a/src/devices/video/pc_vga.h b/src/devices/video/pc_vga.h index 2c32c25cbb0..a12ef1c477c 100644 --- a/src/devices/video/pc_vga.h +++ b/src/devices/video/pc_vga.h @@ -64,7 +64,7 @@ protected: virtual void device_reset() override; // device_palette_interface overrides - virtual uint32_t palette_entries() const override { return 0x100; } + virtual uint32_t palette_entries() const noexcept override { return 0x100; } void vga_vh_text(bitmap_rgb32 &bitmap, const rectangle &cliprect); void vga_vh_ega(bitmap_rgb32 &bitmap, const rectangle &cliprect); diff --git a/src/devices/video/psx.h b/src/devices/video/psx.h index 55ab431b716..0482369692e 100644 --- a/src/devices/video/psx.h +++ b/src/devices/video/psx.h @@ -54,7 +54,7 @@ protected: virtual void device_config_complete() override; // device_palette_interface overrides - virtual uint32_t palette_entries() const override { return 32*32*32*2; } + virtual uint32_t palette_entries() const noexcept override { return 32*32*32*2; } int vramSize; diff --git a/src/devices/video/snes_ppu.h b/src/devices/video/snes_ppu.h index f6ae1b09fa4..c07f878f402 100644 --- a/src/devices/video/snes_ppu.h +++ b/src/devices/video/snes_ppu.h @@ -315,8 +315,8 @@ protected: // device_palette_interface overrides // 256 word CG RAM data (0x000-0x0ff), 8 group of direct colours (0x100-0x8ff), Fixed color (0x900) - virtual uint32_t palette_entries() const override { return 0x100 + (0x100 * 8) + 1; } - virtual uint32_t palette_indirect_entries() const override { return 32 * 32 * 32; } // 15 bit BGR + virtual uint32_t palette_entries() const noexcept override { return 0x100 + (0x100 * 8) + 1; } + virtual uint32_t palette_indirect_entries() const noexcept override { return 32 * 32 * 32; } // 15 bit BGR private: static constexpr uint16_t DIRECT_COLOUR = 0x100; // Position in palette entry for direct colour diff --git a/src/devices/video/tlc34076.h b/src/devices/video/tlc34076.h index 7c4b021bd27..c495cf82088 100644 --- a/src/devices/video/tlc34076.h +++ b/src/devices/video/tlc34076.h @@ -50,7 +50,7 @@ protected: virtual void device_reset() override; // device_palette_interface overrides - virtual uint32_t palette_entries() const override { return 0x100; } + virtual uint32_t palette_entries() const noexcept override { return 0x100; } private: // internal helpers diff --git a/src/devices/video/tms9928a.h b/src/devices/video/tms9928a.h index 34dfc7d270f..d50bec1cf4d 100644 --- a/src/devices/video/tms9928a.h +++ b/src/devices/video/tms9928a.h @@ -100,7 +100,7 @@ protected: virtual space_config_vector memory_space_config() const override; // device_palette_interface overrides - virtual uint32_t palette_entries() const override { return 16; } + virtual uint32_t palette_entries() const noexcept override { return 16; } TIMER_CALLBACK_MEMBER(clock_grom); TIMER_CALLBACK_MEMBER(update_line); diff --git a/src/devices/video/v9938.h b/src/devices/video/v9938.h index b4ac02771da..265cad5eac1 100644 --- a/src/devices/video/v9938.h +++ b/src/devices/video/v9938.h @@ -105,7 +105,7 @@ protected: virtual space_config_vector memory_space_config() const override; virtual void palette_init() = 0; - virtual u32 palette_entries() const override { return 16 + 256; } + virtual u32 palette_entries() const noexcept override { return 16 + 256; } TIMER_CALLBACK_MEMBER(update_line); diff --git a/src/devices/video/vic4567.h b/src/devices/video/vic4567.h index 8afe986c41c..06c78f2a48e 100644 --- a/src/devices/video/vic4567.h +++ b/src/devices/video/vic4567.h @@ -134,7 +134,7 @@ protected: virtual void device_reset() override; // device_palette_interface override - virtual uint32_t palette_entries() const override { return 0x100; } + virtual uint32_t palette_entries() const noexcept override { return 0x100; } private: static constexpr unsigned SPRITE_BASE_X_SIZE = 24; diff --git a/src/emu/dipalette.h b/src/emu/dipalette.h index 1e84b2848e8..5d7f6b30506 100644 --- a/src/emu/dipalette.h +++ b/src/emu/dipalette.h @@ -43,8 +43,8 @@ class device_palette_interface : public device_interface public: // getters - u32 entries() const { return palette_entries(); } - u32 indirect_entries() const { return palette_indirect_entries(); } + u32 entries() const noexcept { return palette_entries(); } + u32 indirect_entries() const noexcept { return palette_indirect_entries(); } palette_t *palette() const { return m_palette; } const pen_t &pen(int index) const { return m_pens[index]; } const pen_t *pens() const { return m_pens; } @@ -53,8 +53,8 @@ public: double pen_contrast(pen_t pen) const { return m_palette->entry_contrast(pen); } pen_t black_pen() const { return m_black_pen; } pen_t white_pen() const { return m_white_pen; } - bool shadows_enabled() const { return palette_shadows_enabled(); } - bool hilights_enabled() const { return palette_hilights_enabled(); } + bool shadows_enabled() const noexcept { return palette_shadows_enabled(); } + bool hilights_enabled() const noexcept { return palette_hilights_enabled(); } // setters void set_pen_color(pen_t pen, rgb_t rgb) { m_palette->entry_set_color(pen, rgb); } @@ -92,10 +92,10 @@ protected: virtual void interface_post_stop() override; // configuration-related overrides - virtual u32 palette_entries() const = 0; - virtual u32 palette_indirect_entries() const { return 0; } - virtual bool palette_shadows_enabled() const { return false; } - virtual bool palette_hilights_enabled() const { return false; } + virtual u32 palette_entries() const noexcept = 0; + virtual u32 palette_indirect_entries() const noexcept { return 0; } + virtual bool palette_shadows_enabled() const noexcept { return false; } + virtual bool palette_hilights_enabled() const noexcept { return false; } private: // internal helpers diff --git a/src/emu/emupal.h b/src/emu/emupal.h index 73ee3809e90..cb4884a72fb 100644 --- a/src/emu/emupal.h +++ b/src/emu/emupal.h @@ -373,10 +373,10 @@ protected: virtual void device_start() override; // device_palette_interface overrides - virtual u32 palette_entries() const override { return m_entries; } - virtual u32 palette_indirect_entries() const override { return m_indirect_entries; } - virtual bool palette_shadows_enabled() const override { return m_enable_shadows; } - virtual bool palette_hilights_enabled() const override { return m_enable_hilights; } + virtual u32 palette_entries() const noexcept override { return m_entries; } + virtual u32 palette_indirect_entries() const noexcept override { return m_indirect_entries; } + virtual bool palette_shadows_enabled() const noexcept override { return m_enable_shadows; } + virtual bool palette_hilights_enabled() const noexcept override { return m_enable_hilights; } // generic palette init routines void palette_init_all_black(palette_device &palette); diff --git a/src/mame/agat/agat7.h b/src/mame/agat/agat7.h index 30696487f5e..7c54582510b 100644 --- a/src/mame/agat/agat7.h +++ b/src/mame/agat/agat7.h @@ -41,7 +41,7 @@ protected: virtual void device_reset() override; virtual void device_add_mconfig(machine_config &config) override; - virtual u32 palette_entries() const override { return 16; } + virtual u32 palette_entries() const noexcept override { return 16; } void text_update_lores(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); void text_update_hires(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); diff --git a/src/mame/agat/agat9.h b/src/mame/agat/agat9.h index daea11e7589..d9c2116f72a 100644 --- a/src/mame/agat/agat9.h +++ b/src/mame/agat/agat9.h @@ -49,7 +49,7 @@ protected: virtual void device_reset() override; virtual void device_add_mconfig(machine_config &config) override; - virtual u32 palette_entries() const override { return 16; } + virtual u32 palette_entries() const noexcept override { return 16; } void text_update_lores(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); void text_update_hires(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int beginrow, int endrow); diff --git a/src/mame/apple/apple2video.cpp b/src/mame/apple/apple2video.cpp index f96b1fde45d..0eceaed22ba 100644 --- a/src/mame/apple/apple2video.cpp +++ b/src/mame/apple/apple2video.cpp @@ -1343,7 +1343,7 @@ void a2_video_device::init_palette() set_pen_color(i, apple2_palette[i]); } -uint32_t a2_video_device::palette_entries() const +uint32_t a2_video_device::palette_entries() const noexcept { return std::size(apple2_palette); } diff --git a/src/mame/apple/apple2video.h b/src/mame/apple/apple2video.h index c57d60f013e..3962205613c 100644 --- a/src/mame/apple/apple2video.h +++ b/src/mame/apple/apple2video.h @@ -69,7 +69,7 @@ protected: virtual void device_reset() override; virtual void device_start() override; - virtual uint32_t palette_entries() const override; + virtual uint32_t palette_entries() const noexcept override; void init_palette(); private: diff --git a/src/mame/atari/atarist_v.h b/src/mame/atari/atarist_v.h index 50a15dc50cb..dd41f293652 100644 --- a/src/mame/atari/atarist_v.h +++ b/src/mame/atari/atarist_v.h @@ -56,7 +56,7 @@ protected: virtual void device_resolve_objects() override; virtual void device_start() override; virtual void device_reset() override; - virtual uint32_t palette_entries() const override { return 16; } + virtual uint32_t palette_entries() const noexcept override { return 16; } private: inline pen_t shift_mode_0(); @@ -118,7 +118,7 @@ public: protected: virtual void device_start() override; - virtual uint32_t palette_entries() const override { return 512; } + virtual uint32_t palette_entries() const noexcept override { return 512; } private: // shifter state diff --git a/src/mame/atari/tia.h b/src/mame/atari/tia.h index 4b7100b6896..8a169e24415 100644 --- a/src/mame/atari/tia.h +++ b/src/mame/atari/tia.h @@ -61,7 +61,7 @@ protected: virtual void device_reset() override; // device_palette_interface overrides - virtual uint32_t palette_entries() const override { return TIA_PALETTE_LENGTH; } + virtual uint32_t palette_entries() const noexcept override { return TIA_PALETTE_LENGTH; } void extend_palette(); virtual void init_palette() = 0; diff --git a/src/mame/dataeast/deco_ace.h b/src/mame/dataeast/deco_ace.h index 9493b5111ef..e79680aae98 100644 --- a/src/mame/dataeast/deco_ace.h +++ b/src/mame/dataeast/deco_ace.h @@ -43,7 +43,7 @@ protected: virtual void device_post_load() override; // device_palette_interface overrides - virtual uint32_t palette_entries() const override { return 2048 * 2; } + virtual uint32_t palette_entries() const noexcept override { return 2048 * 2; } private: // internal state diff --git a/src/mame/dataeast/decrmc3.h b/src/mame/dataeast/decrmc3.h index 72f14a0c9c7..aa5da4e3982 100644 --- a/src/mame/dataeast/decrmc3.h +++ b/src/mame/dataeast/decrmc3.h @@ -87,8 +87,8 @@ protected: virtual void device_start() override; // device_palette_interface overrides - virtual u32 palette_entries() const override { return m_entries; } - virtual u32 palette_indirect_entries() const override { return m_indirect_entries; } + virtual u32 palette_entries() const noexcept override { return m_entries; } + virtual u32 palette_indirect_entries() const noexcept override { return m_indirect_entries; } private: void update_for_write(offs_t byte_offset, int bytes_modified, bool indirect = false); diff --git a/src/mame/kaneko/kaneko_grap2.h b/src/mame/kaneko/kaneko_grap2.h index 1c62c11f62b..967732d954e 100644 --- a/src/mame/kaneko/kaneko_grap2.h +++ b/src/mame/kaneko/kaneko_grap2.h @@ -74,7 +74,7 @@ protected: virtual void rom_bank_updated() override; // device_palette_interface overrides - virtual uint32_t palette_entries() const override { return PALETTE_SIZE; } + virtual uint32_t palette_entries() const noexcept override { return PALETTE_SIZE; } }; diff --git a/src/mame/namco/namco_c116.h b/src/mame/namco/namco_c116.h index c9688479d2f..1fed49db5f4 100644 --- a/src/mame/namco/namco_c116.h +++ b/src/mame/namco/namco_c116.h @@ -34,8 +34,8 @@ protected: virtual void device_start() override; // device_palette_interface overrides - virtual uint32_t palette_entries() const override { return 0x2000; } - virtual bool palette_shadows_enabled() const override { return m_enable_shadows; } + virtual uint32_t palette_entries() const noexcept override { return 0x2000; } + virtual bool palette_shadows_enabled() const noexcept override { return m_enable_shadows; } private: // internal state diff --git a/src/mame/namco/ygv608.h b/src/mame/namco/ygv608.h index 99ade70c34c..0e96f289c1f 100644 --- a/src/mame/namco/ygv608.h +++ b/src/mame/namco/ygv608.h @@ -103,7 +103,7 @@ protected: virtual space_config_vector memory_space_config() const override; - virtual uint32_t palette_entries() const override { return 256; } + virtual uint32_t palette_entries() const noexcept override { return 256; } TIMER_CALLBACK_MEMBER(update_vblank_flag); TIMER_CALLBACK_MEMBER(update_raster_flag); diff --git a/src/mame/sgi/sgi_xmap2.h b/src/mame/sgi/sgi_xmap2.h index 01bc35c48b7..ab58f727354 100644 --- a/src/mame/sgi/sgi_xmap2.h +++ b/src/mame/sgi/sgi_xmap2.h @@ -18,7 +18,7 @@ public: virtual void device_reset() override; // device_palette_interface overrides - virtual u32 palette_entries() const override { return 4096 + 16; } + virtual u32 palette_entries() const noexcept override { return 4096 + 16; } u8 reg_r(offs_t offset); void reg_w(offs_t offset, u8 data); diff --git a/src/mame/shared/alpha68k_palette.h b/src/mame/shared/alpha68k_palette.h index 1149a9404c6..cc97e643c49 100644 --- a/src/mame/shared/alpha68k_palette.h +++ b/src/mame/shared/alpha68k_palette.h @@ -45,7 +45,7 @@ protected: virtual void device_start() override; virtual void device_reset() override; - virtual uint32_t palette_entries() const override { return m_entries; } + virtual uint32_t palette_entries() const noexcept override { return m_entries; } private: std::vector m_paletteram; u32 m_entries = 0; diff --git a/src/mame/shared/mega32x.h b/src/mame/shared/mega32x.h index 5d07d35df4d..14a952117e5 100644 --- a/src/mame/shared/mega32x.h +++ b/src/mame/shared/mega32x.h @@ -107,7 +107,7 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // device_palette_interface overrides - virtual uint32_t palette_entries() const override { return 32*32*32/**2*/; } + virtual uint32_t palette_entries() const noexcept override { return 32*32*32/**2*/; } // device_sound_interface overrides virtual void sound_stream_update(sound_stream &stream, std::vector const &inputs, std::vector &outputs) override; diff --git a/src/mame/taito/tc0110pcr.h b/src/mame/taito/tc0110pcr.h index 0cdc8c25c0b..4a5f7c402b5 100644 --- a/src/mame/taito/tc0110pcr.h +++ b/src/mame/taito/tc0110pcr.h @@ -26,7 +26,7 @@ protected: virtual void device_post_load() override; // device_palette_interface overrides - virtual u32 palette_entries() const override { return TC0110PCR_RAM_SIZE; } + virtual u32 palette_entries() const noexcept override { return TC0110PCR_RAM_SIZE; } private: static const unsigned TC0110PCR_RAM_SIZE = 0x2000 / 2; -- cgit v1.2.3