diff options
Diffstat (limited to 'src/lib/netlist/nl_base.h')
-rw-r--r-- | src/lib/netlist/nl_base.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h index 24f57c979c1..dc33e8c6698 100644 --- a/src/lib/netlist/nl_base.h +++ b/src/lib/netlist/nl_base.h @@ -71,7 +71,7 @@ class NETLIB_NAME(name) : public device_t /*! Used to define the destructor of a netlist device. * The use of a destructor for netlist device should normally not be necessary. */ -#define NETLIB_DESTRUCTOR(name) public: virtual ~NETLIB_NAME(name)() +#define NETLIB_DESTRUCTOR(name) public: virtual ~NETLIB_NAME(name)() noexcept /*! Define an extended constructor and add further parameters to it. * The macro allows to add further parameters to a device constructor. This is @@ -418,11 +418,12 @@ namespace netlist */ pstring name() const; +#if 0 void * operator new (size_t size, void *ptr) { plib::unused_var(size); return ptr; } void operator delete (void *ptr, void *) { plib::unused_var(ptr); } - void * operator new (size_t size) = delete; - void operator delete (void * mem); + void operator delete (void * mem) = delete; +#endif protected: ~object_t() noexcept = default; // only childs should be destructible @@ -451,7 +452,7 @@ namespace netlist const netlist_t & exec() const noexcept { return m_netlist; } protected: - ~netlist_ref() = default; // prohibit polymorphic destruction + ~netlist_ref() noexcept = default; // prohibit polymorphic destruction private: netlist_t & m_netlist; @@ -941,7 +942,7 @@ namespace netlist param_type_t param_type() const; protected: - virtual ~param_t() = default; /* not intended to be destroyed */ + virtual ~param_t() noexcept = default; /* not intended to be destroyed */ void update_param(); @@ -1182,7 +1183,7 @@ namespace netlist COPYASSIGNMOVE(device_t, delete) - ~device_t() override = default; + ~device_t() noexcept override = default; setup_t &setup(); const setup_t &setup() const; |