Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-07 13:23:50 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #1198 from ajrhacker/nl_noexcept_fix

Browse Source 
More consistent use of NL_NOEXCEPT macro to fix debug build (nw)
This commit is contained in:
Vas Crabb 2016-08-07 11:52:31 +10:00 committed by GitHub
commit cc34eca70b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib/netlist/nl_base.h
View File

@ -117,7 +117,7 @@ class NETLIB_NAME(name) : public device_t
#define NETLIB_FAMILY(family) , m_famsetter(*this, family)
#define NETLIB_UPDATE_TERMINALSI() public: virtual void update_terminals() override
#define NETLIB_UPDATEI() protected: virtual void update() noexcept override
#define NETLIB_UPDATEI() protected: virtual void update() NL_NOEXCEPT override
#define NETLIB_UPDATE_PARAMI() public: virtual void update_param() override
#define NETLIB_RESETI() protected: virtual void reset() override
@ -901,14 +901,14 @@ namespace netlist
virtual ~core_device_t();
void update_dev() noexcept
void update_dev() NL_NOEXCEPT
{
m_stat_total_time.start();
do_update();
m_stat_total_time.stop();
}
void do_update() noexcept
void do_update() NL_NOEXCEPT
{
#if (NL_PMF_TYPE == NL_PMF_TYPE_GNUC_PMF)
(this->*m_static_update)();
@ -946,7 +946,7 @@ namespace netlist
protected:
virtual void update() noexcept { }
virtual void update() NL_NOEXCEPT { }
virtual void inc_active() noexcept { }
virtual void dec_active() noexcept { }
virtual void stop() { }