diff --git a/src/lib/netlist/analog/nld_bjt.h b/src/lib/netlist/analog/nld_bjt.h index 520321f2db2..07f5923c17c 100644 --- a/src/lib/netlist/analog/nld_bjt.h +++ b/src/lib/netlist/analog/nld_bjt.h @@ -47,9 +47,9 @@ public: inline bool is_qtype(q_type atype) const { return m_qtype == atype; } inline void set_qtype(q_type atype) { m_qtype = atype; } protected: - virtual void start(); - virtual void reset(); - ATTR_HOT void update(); + virtual void start() override; + virtual void reset() override; + ATTR_HOT void update() override; param_model_t m_model; private: @@ -102,7 +102,7 @@ public: m_gB(NETLIST_GMIN_DEFAULT), m_gC(NETLIST_GMIN_DEFAULT), m_V(0.0), m_state_on(0) { } - ATTR_HOT void virtual update(); + ATTR_HOT void virtual update() override; nld_twoterm m_RB; nld_twoterm m_RC; @@ -113,9 +113,9 @@ public: protected: - virtual void start(); - ATTR_HOT virtual void update_param(); - virtual void reset(); + virtual void start() override; + ATTR_HOT virtual void update_param() override; + virtual void reset() override; NETLIB_UPDATE_TERMINALSI(); nl_double m_gB; // base conductance / switch on @@ -145,10 +145,10 @@ public: protected: - virtual void start(); - virtual void reset(); - ATTR_HOT void update_param(); - ATTR_HOT void virtual update(); + virtual void start() override; + virtual void reset() override; + ATTR_HOT void update_param() override; + ATTR_HOT void virtual update() override; NETLIB_UPDATE_TERMINALSI(); generic_diode m_gD_BC; diff --git a/src/lib/netlist/analog/nld_fourterm.h b/src/lib/netlist/analog/nld_fourterm.h index 591df68dd79..7bed4e71a52 100644 --- a/src/lib/netlist/analog/nld_fourterm.h +++ b/src/lib/netlist/analog/nld_fourterm.h @@ -63,10 +63,10 @@ public: param_double_t m_RI; protected: - virtual void start(); - virtual void reset(); - virtual void update_param(); - ATTR_HOT virtual void update(); + virtual void start() override; + virtual void reset() override; + virtual void update_param() override; + ATTR_HOT virtual void update() override; ATTR_COLD void start_internal(const nl_double def_RI); @@ -95,10 +95,10 @@ public: param_double_t m_cur_limit; /* current limit */ protected: - virtual void start(); - virtual void reset(); - virtual void update_param(); - ATTR_HOT virtual void update(); + virtual void start() override; + virtual void reset() override; + virtual void update_param() override; + ATTR_HOT virtual void update() override; NETLIB_UPDATE_TERMINALSI(); nl_double m_vi; @@ -134,10 +134,10 @@ public: : NETLIB_NAME(VCCS)(CCCS), m_gfac(1.0) { } protected: - virtual void start(); - virtual void reset(); - virtual void update_param(); - ATTR_HOT void update(); + virtual void start() override; + virtual void reset() override; + virtual void update_param() override; + ATTR_HOT void update() override; nl_double m_gfac; }; @@ -180,9 +180,9 @@ public: param_double_t m_RO; protected: - virtual void start(); - virtual void reset(); - virtual void update_param(); + virtual void start() override; + virtual void reset() override; + virtual void update_param() override; //ATTR_HOT void update(); terminal_t m_OP2; diff --git a/src/lib/netlist/analog/nld_twoterm.h b/src/lib/netlist/analog/nld_twoterm.h index 27da8ba258e..9a716094163 100644 --- a/src/lib/netlist/analog/nld_twoterm.h +++ b/src/lib/netlist/analog/nld_twoterm.h @@ -133,9 +133,9 @@ public: } protected: - virtual void start(); - virtual void reset(); - ATTR_HOT void update(); + virtual void start() override; + virtual void reset() override; + ATTR_HOT void update() override; private: }; @@ -155,9 +155,9 @@ public: } protected: - virtual void start(); - virtual void reset(); - ATTR_HOT void update(); + virtual void start() override; + virtual void reset() override; + ATTR_HOT void update() override; }; NETLIB_DEVICE_WITH_PARAMS_DERIVED(R, R_base, @@ -196,15 +196,15 @@ class NETLIB_NAME(C) : public NETLIB_NAME(twoterm) public: ATTR_COLD NETLIB_NAME(C)() : NETLIB_NAME(twoterm)(CAPACITOR), m_GParallel(0.0) { } - ATTR_HOT void step_time(const nl_double st); + ATTR_HOT void step_time(const nl_double st) override; param_double_t m_C; protected: - virtual void start(); - virtual void reset(); - virtual void update_param(); - ATTR_HOT void update(); + virtual void start() override; + virtual void reset() override; + virtual void update_param() override; + ATTR_HOT void update() override; private: nl_double m_GParallel; @@ -298,9 +298,9 @@ public: param_model_t m_model; protected: - virtual void start(); - virtual void update_param(); - ATTR_HOT void update(); + virtual void start() override; + virtual void update_param() override; + ATTR_HOT void update() override; generic_diode m_D; }; @@ -317,9 +317,9 @@ public: ATTR_COLD NETLIB_NAME(VS)() : NETLIB_NAME(twoterm)(VS) { } protected: - virtual void start(); - virtual void reset(); - ATTR_HOT void update(); + virtual void start() override; + virtual void reset() override; + ATTR_HOT void update() override; param_double_t m_R; param_double_t m_V; @@ -335,9 +335,9 @@ public: ATTR_COLD NETLIB_NAME(CS)() : NETLIB_NAME(twoterm)(CS) { } protected: - virtual void start(); - virtual void reset(); - ATTR_HOT void update(); + virtual void start() override; + virtual void reset() override; + ATTR_HOT void update() override; param_double_t m_I; }; diff --git a/src/lib/netlist/devices/nld_cmos.h b/src/lib/netlist/devices/nld_cmos.h index 6883993a794..61e1e8f7dae 100644 --- a/src/lib/netlist/devices/nld_cmos.h +++ b/src/lib/netlist/devices/nld_cmos.h @@ -24,13 +24,13 @@ class nld_vdd_vss : public device_t analog_input_t m_vss; protected: - ATTR_HOT void update() {}; - ATTR_HOT void start() + ATTR_HOT void update() override {}; + ATTR_HOT void start() override { register_input("VDD", m_vdd); register_input("VSS", m_vss); }; - ATTR_HOT void reset() {}; + ATTR_HOT void reset() override {}; public: ATTR_HOT inline nl_double vdd() { return INPANALOG(m_vdd); } diff --git a/src/lib/netlist/devices/nld_signal.h b/src/lib/netlist/devices/nld_signal.h index fa8e9e6265b..0e659557e02 100644 --- a/src/lib/netlist/devices/nld_signal.h +++ b/src/lib/netlist/devices/nld_signal.h @@ -37,7 +37,7 @@ public: { } - void start() + void start() override { const char *sIN[8] = { "A", "B", "C", "D", "E", "F", "G", "H" }; @@ -49,7 +49,7 @@ public: save(NLNAME(m_active)); } - void reset() + void reset() override { m_Q[0].initial(0); m_active = 1; @@ -72,7 +72,7 @@ public: return _check ^ _invert; } - ATTR_HOT virtual void inc_active() + ATTR_HOT virtual void inc_active() override { const netlist_time times[2] = { NLTIME_FROM_NS(15), NLTIME_FROM_NS(22)}; nl_assert(netlist().use_deactivate()); @@ -90,7 +90,7 @@ public: } } - ATTR_HOT virtual void dec_active() + ATTR_HOT virtual void dec_active() override { nl_assert(netlist().use_deactivate()); if (--m_active == 0) @@ -100,7 +100,7 @@ public: } } - virtual void update() + virtual void update() override { const netlist_time times[2] = { NLTIME_FROM_NS(15), NLTIME_FROM_NS(22)}; diff --git a/src/lib/netlist/devices/nld_system.h b/src/lib/netlist/devices/nld_system.h index 2ea6fbed4d4..a50860c3ac4 100644 --- a/src/lib/netlist/devices/nld_system.h +++ b/src/lib/netlist/devices/nld_system.h @@ -136,7 +136,7 @@ NETLIB_DEVICE_WITH_PARAMS(extclock, NETLIB_DEVICE_WITH_PARAMS(logic_input, - virtual void stop(); + virtual void stop() override; logic_output_t m_Q; param_logic_t m_IN; @@ -163,16 +163,16 @@ public: protected: - void start() + void start() override { register_output("Q", m_Q); } - void reset() + void reset() override { } - void update() + void update() override { OUTANALOG(m_Q, 0.0); } @@ -196,16 +196,16 @@ public: protected: - void start() + void start() override { register_input("I", m_I); } - void reset() + void reset() override { } - void update() + void update() override { } @@ -228,7 +228,7 @@ public: protected: - void start() + void start() override { register_param("RIN", m_p_RIN, 1.0e6); register_param("ROUT", m_p_ROUT, 50.0); @@ -244,13 +244,13 @@ protected: connect_late(m_Q, m_ROUT.m_P); } - void reset() + void reset() override { m_RIN.set(1.0 / m_p_RIN.Value(),0,0); m_ROUT.set(1.0 / m_p_ROUT.Value(),0,0); } - void update() + void update() override { OUTANALOG(m_Q, INPANALOG(m_I)); } @@ -281,9 +281,9 @@ public: protected: - void start(); - void reset(); - void update(); + void start() override; + void reset() override; + void update() override; private: @@ -331,10 +331,10 @@ public: protected: - void start(); - void reset(); - ATTR_HOT void update(); - ATTR_HOT void update_param(); + void start() override; + void reset() override; + ATTR_HOT void update() override; + ATTR_HOT void update_param() override; private: UINT8 m_last_state; @@ -391,17 +391,17 @@ public: logic_output_t m_Q; protected: - void start() + void start() override { register_input("I", m_I); register_output("Q", m_Q); } - void reset() + void reset() override { } - ATTR_HOT void update() + ATTR_HOT void update() override { if (m_I.Q_Analog() > logic_family().m_high_thresh_V) OUTLOGIC(m_Q, 1, NLTIME_FROM_NS(1)); @@ -432,7 +432,7 @@ protected: { } - virtual void start() + virtual void start() override { register_input("I", m_I); } @@ -456,11 +456,11 @@ public: virtual ~nld_d_to_a_proxy() {} protected: - virtual void start(); + virtual void start() override; - virtual void reset(); + virtual void reset() override; - ATTR_HOT void update(); + ATTR_HOT void update() override; private: analog_output_t m_Q; @@ -484,20 +484,20 @@ public: public: dummy(const pstring &dev_name) : device_t(), m_dev_name(dev_name) { } protected: - virtual void init(netlist_t &anetlist, const pstring &aname) + virtual void init(netlist_t &anetlist, const pstring &aname) override { anetlist.setup().namespace_push(aname); anetlist.setup().include(m_dev_name); anetlist.setup().namespace_pop(); } - void start() { } - void reset() { } - void update() { } + void start() override { } + void reset() override { } + void update() override { } pstring m_dev_name; }; - ATTR_COLD device_t *Create() + ATTR_COLD device_t *Create() override { device_t *r = palloc(dummy(this->name())); return r; diff --git a/src/lib/netlist/devices/nld_truthtable.h b/src/lib/netlist/devices/nld_truthtable.h index b5a90d8125c..47e479a0256 100644 --- a/src/lib/netlist/devices/nld_truthtable.h +++ b/src/lib/netlist/devices/nld_truthtable.h @@ -126,7 +126,7 @@ public: m_desc = desc; } - virtual void start() + virtual void start() override { pstring header = m_desc[0]; @@ -181,7 +181,7 @@ public: save(NLNAME(m_active)); } - void reset() + void reset() override { m_active = 0; m_ign = 0; @@ -242,12 +242,12 @@ public: } } - ATTR_HOT void update() + ATTR_HOT void update() override { process(); } - ATTR_HOT void inc_active() + ATTR_HOT void inc_active() override { nl_assert(netlist().use_deactivate()); if (has_state == 0) @@ -257,7 +257,7 @@ public: } } - ATTR_HOT void dec_active() + ATTR_HOT void dec_active() override { nl_assert(netlist().use_deactivate()); /* FIXME: @@ -321,7 +321,7 @@ public: const pstring &def_param) : netlist_base_factory_truthtable_t(name, classname, def_param) { } - device_t *Create() + device_t *Create() override { typedef nld_truthtable_t tt_type; device_t *r = palloc(tt_type(&m_ttbl, m_desc)); diff --git a/src/lib/netlist/nl_base.cpp b/src/lib/netlist/nl_base.cpp index ce818e0d94f..f39de181da1 100644 --- a/src/lib/netlist/nl_base.cpp +++ b/src/lib/netlist/nl_base.cpp @@ -37,7 +37,7 @@ public: m_R_high = 130.0; m_is_static = true; } - virtual devices::nld_base_d_to_a_proxy *create_d_a_proxy(logic_output_t *proxied) const + virtual devices::nld_base_d_to_a_proxy *create_d_a_proxy(logic_output_t *proxied) const override { return palloc(devices::nld_d_to_a_proxy(proxied)); } @@ -58,7 +58,7 @@ public: m_R_high = 10.0; m_is_static = true; } - virtual devices::nld_base_d_to_a_proxy *create_d_a_proxy(logic_output_t *proxied) const + virtual devices::nld_base_d_to_a_proxy *create_d_a_proxy(logic_output_t *proxied) const override { return palloc(devices::nld_d_to_a_proxy(proxied)); } diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h index 4bc152e253f..a47ca7c6fc5 100644 --- a/src/lib/netlist/nl_base.h +++ b/src/lib/netlist/nl_base.h @@ -190,7 +190,7 @@ typedef UINT8 netlist_sig_t; #define NETLIB_FUNC_VOID(_chip, _name, _params) ATTR_HOT void NETLIB_NAME(_chip) :: _name _params #define NETLIB_UPDATE_TERMINALS(_chip) ATTR_HOT void NETLIB_NAME(_chip) :: update_terminals(void) -#define NETLIB_UPDATE_TERMINALSI() ATTR_HOT void update_terminals(void) +#define NETLIB_UPDATE_TERMINALSI() ATTR_HOT void update_terminals(void) override #define NETLIB_UPDATEI() ATTR_HOT void update(void) #define NETLIB_DEVICE_BASE(_name, _pclass, _extra, _priv) \ @@ -201,9 +201,9 @@ typedef UINT8 netlist_sig_t; : _pclass() { } \ protected: \ _extra \ - ATTR_HOT void update(); \ - ATTR_HOT void start(); \ - ATTR_HOT void reset(); \ + ATTR_HOT void update() override; \ + ATTR_HOT void start() override; \ + ATTR_HOT void reset() override; \ _priv \ } @@ -224,25 +224,25 @@ typedef UINT8 netlist_sig_t; : device_t() \ { } \ /*protected:*/ \ - ATTR_HOT void update(); \ - ATTR_HOT void start(); \ - ATTR_HOT void reset(); \ + ATTR_HOT void update() override; \ + ATTR_HOT void start() override; \ + ATTR_HOT void reset() override; \ public: \ _priv \ } #define NETLIB_DEVICE_WITH_PARAMS(_name, _priv) \ NETLIB_DEVICE_BASE(NETLIB_NAME(_name), device_t, \ - ATTR_HOT void update_param(); \ + ATTR_HOT void update_param() override; \ , _priv) #define NETLIB_DEVICE_WITH_PARAMS_DERIVED(_name, _pclass, _priv) \ NETLIB_DEVICE_BASE(NETLIB_NAME(_name), NETLIB_NAME(_pclass), \ - ATTR_HOT void update_param(); \ + ATTR_HOT void update_param() override; \ , _priv) #define NETLIB_LOGIC_FAMILY(_fam) \ -virtual logic_family_desc_t *default_logic_family() \ +virtual logic_family_desc_t *default_logic_family() override \ { \ return netlist_family_ ## _fam; \ } @@ -497,7 +497,7 @@ namespace netlist ATTR_HOT /* inline */ void update_dev(const UINT32 mask); protected: - virtual void save_register() + virtual void save_register() override { save(NLNAME(m_state)); device_object_t::save_register(); @@ -548,9 +548,9 @@ namespace netlist terminal_t *m_otherterm; protected: - virtual void save_register(); + virtual void save_register() override; - virtual void reset(); + virtual void reset() override; private: ATTR_HOT void set_ptr(nl_double *ptr, const nl_double val) { @@ -624,7 +624,7 @@ namespace netlist ATTR_HOT void activate_lh(); protected: - virtual void reset() + virtual void reset() override { //netlist_core_terminal_t::reset(); set_state(STATE_INP_ACTIVE); @@ -648,7 +648,7 @@ namespace netlist ATTR_HOT nl_double Q_Analog() const; protected: - virtual void reset() + virtual void reset() override { //netlist_core_terminal_t::reset(); set_state(STATE_INP_ACTIVE); @@ -716,8 +716,8 @@ namespace netlist protected: //FIXME: needed by current solver code - virtual void save_register(); - virtual void reset(); + virtual void save_register() override; + virtual void reset() override; netlist_sig_t m_new_Q; netlist_sig_t m_cur_Q; @@ -789,8 +789,8 @@ namespace netlist protected: //FIXME: needed by current solver code - virtual void save_register(); - virtual void reset(); + virtual void save_register() override; + virtual void reset() override; private: @@ -826,8 +826,8 @@ namespace netlist protected: - virtual void save_register(); - virtual void reset(); + virtual void save_register() override; + virtual void reset() override; private: @@ -852,7 +852,7 @@ namespace netlist ATTR_COLD logic_output_t(); ATTR_COLD void init_object(core_device_t &dev, const pstring &aname); - virtual void reset() + virtual void reset() override { set_state(STATE_OUT); } @@ -876,7 +876,7 @@ namespace netlist ATTR_COLD analog_output_t(); ATTR_COLD void init_object(core_device_t &dev, const pstring &aname); - virtual void reset() + virtual void reset() override { set_state(STATE_OUT); } @@ -914,7 +914,7 @@ namespace netlist protected: - virtual void reset() { } + virtual void reset() override { } private: const param_type_t m_param_type; @@ -938,7 +938,7 @@ namespace netlist ATTR_HOT C Value() const { return m_param; } protected: - virtual void save_register() + virtual void save_register() override { /* pstrings not yet supported, these need special logic */ if (T != param_t::STRING && T != param_t::MODEL) @@ -973,7 +973,7 @@ namespace netlist ATTR_COLD const pstring model_value_str(const pstring &entity); ATTR_COLD const pstring model_type(); protected: - void changed() + void changed() override { m_map.clear(); } @@ -1089,7 +1089,7 @@ namespace netlist virtual ~device_t(); - virtual void init(netlist_t &anetlist, const pstring &name); + virtual void init(netlist_t &anetlist, const pstring &name) override; ATTR_COLD setup_t &setup(); @@ -1110,9 +1110,9 @@ namespace netlist protected: - ATTR_HOT virtual void update() { } - ATTR_HOT virtual void start() { } - ATTR_HOT virtual void update_terminals() { } + ATTR_HOT virtual void update() override { } + ATTR_HOT virtual void start() override { } + ATTR_HOT virtual void update_terminals() override { } template ATTR_COLD void register_param(const pstring &sname, C ¶m, const T initialVal); @@ -1134,11 +1134,11 @@ namespace netlist protected: - void reset() {} + void reset() override {} - void register_state(pstate_manager_t &manager, const pstring &module); - void on_pre_save(); - void on_post_load(); + void register_state(pstate_manager_t &manager, const pstring &module) override; + void on_pre_save() override; + void on_post_load() override; private: struct names_t { char m_buf[64]; }; @@ -1243,8 +1243,8 @@ namespace netlist // virtual void vlog(const plog_level &l, const pstring &ls) = 0; /* from netlist_object */ - virtual void reset(); - virtual void save_register(); + virtual void reset() override; + virtual void save_register() override; #if (NL_KEEP_STATISTICS) // performance diff --git a/src/lib/netlist/nl_factory.h b/src/lib/netlist/nl_factory.h index b758941dd71..cc007960c6e 100644 --- a/src/lib/netlist/nl_factory.h +++ b/src/lib/netlist/nl_factory.h @@ -54,7 +54,7 @@ namespace netlist const pstring &def_param) : base_factory_t(name, classname, def_param) { } - ATTR_COLD device_t *Create() + ATTR_COLD device_t *Create() override { device_t *r = palloc(C); //r->init(setup, name); diff --git a/src/lib/netlist/nl_parser.h b/src/lib/netlist/nl_parser.h index 73c6cf66837..b11d89f5ff1 100644 --- a/src/lib/netlist/nl_parser.h +++ b/src/lib/netlist/nl_parser.h @@ -42,7 +42,7 @@ namespace netlist /* for debugging messages */ netlist_t &netlist() { return m_setup.netlist(); } - virtual void verror(const pstring &msg, int line_num, const pstring &line); + virtual void verror(const pstring &msg, int line_num, const pstring &line) override; private: nl_double eval_param(const token_t tok); diff --git a/src/lib/netlist/nl_setup.cpp b/src/lib/netlist/nl_setup.cpp index 94cb85ced03..99874a0a06d 100644 --- a/src/lib/netlist/nl_setup.cpp +++ b/src/lib/netlist/nl_setup.cpp @@ -886,7 +886,7 @@ class logic_family_std_proxy_t : public logic_family_desc_t { public: logic_family_std_proxy_t() { } - virtual devices::nld_base_d_to_a_proxy *create_d_a_proxy(logic_output_t *proxied) const + virtual devices::nld_base_d_to_a_proxy *create_d_a_proxy(logic_output_t *proxied) const override { return palloc(devices::nld_d_to_a_proxy(proxied)); } diff --git a/src/lib/netlist/nl_setup.h b/src/lib/netlist/nl_setup.h index 5f056439b3b..4dd12b59854 100644 --- a/src/lib/netlist/nl_setup.h +++ b/src/lib/netlist/nl_setup.h @@ -252,7 +252,7 @@ namespace netlist { } - bool parse(setup_t &setup, const pstring &name); + bool parse(setup_t &setup, const pstring &name) override; private: pstring m_str; @@ -267,7 +267,7 @@ namespace netlist { } - bool parse(setup_t &setup, const pstring &name); + bool parse(setup_t &setup, const pstring &name) override; private: pstring m_filename; @@ -281,7 +281,7 @@ namespace netlist { } - bool parse(setup_t &setup, const pstring &name); + bool parse(setup_t &setup, const pstring &name) override; private: pstring m_str; @@ -297,7 +297,7 @@ namespace netlist { } - bool parse(setup_t &setup, const pstring &name) + bool parse(setup_t &setup, const pstring &name) override { if (name == m_setup_func_name) { diff --git a/src/lib/netlist/plib/pfmtlog.h b/src/lib/netlist/plib/pfmtlog.h index 058152a91cc..7a63d14fc3a 100644 --- a/src/lib/netlist/plib/pfmtlog.h +++ b/src/lib/netlist/plib/pfmtlog.h @@ -158,7 +158,7 @@ public: protected: - void format_element(const char *f, const char *l, const char *fmt_spec, ...); + void format_element(const char *f, const char *l, const char *fmt_spec, ...) override; private: @@ -243,7 +243,7 @@ public: virtual ~plog_channel() { } protected: - virtual void vdowrite(const pstring &ls) const; + virtual void vdowrite(const pstring &ls) const override; private: plog_dispatch_intf *m_base; diff --git a/src/lib/netlist/plib/poptions.h b/src/lib/netlist/plib/poptions.h index b082504930d..c6daa3b2596 100644 --- a/src/lib/netlist/plib/poptions.h +++ b/src/lib/netlist/plib/poptions.h @@ -52,7 +52,7 @@ public: : poption(ashort, along, help, true, parent), m_val(defval) {} - virtual int parse(pstring argument) { m_val = argument; return 0; } + virtual int parse(pstring argument) override { m_val = argument; return 0; } pstring operator ()() { return m_val; } private: @@ -66,7 +66,7 @@ public: : poption(ashort, along, help, true, parent), m_val(defval), m_limit(limit, ":") {} - virtual int parse(pstring argument) + virtual int parse(pstring argument) override { if (m_limit.contains(argument)) { @@ -90,7 +90,7 @@ public: : poption(ashort, along, help, false, parent), m_val(false) {} - virtual int parse(ATTR_UNUSED pstring argument) { m_val = true; return 0; } + virtual int parse(ATTR_UNUSED pstring argument) override { m_val = true; return 0; } bool operator ()() { return m_val; } private: @@ -104,7 +104,7 @@ public: : poption(ashort, along, help, true, parent), m_val(defval) {} - virtual int parse(pstring argument) + virtual int parse(pstring argument) override { bool err = false; m_val = argument.as_double(&err); diff --git a/src/lib/netlist/plib/pstream.h b/src/lib/netlist/plib/pstream.h index 61f0959cadd..6cc4c6a30a7 100644 --- a/src/lib/netlist/plib/pstream.h +++ b/src/lib/netlist/plib/pstream.h @@ -184,9 +184,9 @@ public: protected: /* write n bytes to stream */ - virtual void vwrite(const void *buf, const unsigned n); - virtual void vseek(const pos_type n); - virtual pos_type vtell(); + virtual void vwrite(const void *buf, const unsigned n) override; + virtual void vseek(const pos_type n) override; + virtual pos_type vtell() override; private: pos_type m_pos; @@ -208,12 +208,12 @@ public: protected: /* write n bytes to stream */ - virtual void vwrite(const void *buf, const unsigned n) + virtual void vwrite(const void *buf, const unsigned n) override { m_buf.cat(buf, n); } - virtual void vseek(const pos_type n) { } - virtual pos_type vtell() { return m_buf.len(); } + virtual void vseek(const pos_type n) override { } + virtual pos_type vtell() override { return m_buf.len(); } private: pstringbuffer m_buf; @@ -236,9 +236,9 @@ public: protected: pofilestream(void *file, const bool do_close); /* write n bytes to stream */ - virtual void vwrite(const void *buf, const unsigned n); - virtual void vseek(const pos_type n); - virtual pos_type vtell(); + virtual void vwrite(const void *buf, const unsigned n) override; + virtual void vseek(const pos_type n) override; + virtual pos_type vtell() override; private: void *m_file; @@ -288,9 +288,9 @@ protected: pifilestream(void *file, const bool do_close); /* read up to n bytes from stream */ - virtual unsigned vread(void *buf, const unsigned n); - virtual void vseek(const pos_type n); - virtual pos_type vtell(); + virtual unsigned vread(void *buf, const unsigned n) override; + virtual void vseek(const pos_type n) override; + virtual pos_type vtell() override; private: void *m_file; @@ -327,9 +327,9 @@ public: protected: /* read up to n bytes from stream */ - virtual unsigned vread(void *buf, const unsigned n); - virtual void vseek(const pos_type n); - virtual pos_type vtell(); + virtual unsigned vread(void *buf, const unsigned n) override; + virtual void vseek(const pos_type n) override; + virtual pos_type vtell() override; private: pos_type m_pos; @@ -366,7 +366,7 @@ public: virtual ~pstream_fmt_writer_t() { } protected: - virtual void vdowrite(const pstring &ls) const + virtual void vdowrite(const pstring &ls) const override { m_strm.write(ls); } diff --git a/src/lib/netlist/prg/nltool.cpp b/src/lib/netlist/prg/nltool.cpp index 3510f70e7f2..bbe5e8b3039 100644 --- a/src/lib/netlist/prg/nltool.cpp +++ b/src/lib/netlist/prg/nltool.cpp @@ -194,7 +194,7 @@ public: protected: - void vlog(const plog_level &l, const pstring &ls) const + void vlog(const plog_level &l, const pstring &ls) const override { pout("{}: {}\n", l.name().cstr(), ls.cstr()); if (l == plog_level::FATAL) diff --git a/src/lib/netlist/solver/nld_ms_direct.h b/src/lib/netlist/solver/nld_ms_direct.h index 9116f92d53f..8bb578ec6cd 100644 --- a/src/lib/netlist/solver/nld_ms_direct.h +++ b/src/lib/netlist/solver/nld_ms_direct.h @@ -28,17 +28,17 @@ public: virtual ~matrix_solver_direct_t(); - virtual void vsetup(analog_net_t::list_t &nets); - virtual void reset() { matrix_solver_t::reset(); } + virtual void vsetup(analog_net_t::list_t &nets) override; + virtual void reset() override { matrix_solver_t::reset(); } ATTR_HOT inline unsigned N() const { if (m_N == 0) return m_dim; else return m_N; } ATTR_HOT inline int vsolve_non_dynamic(const bool newton_raphson); protected: - virtual void add_term(int net_idx, terminal_t *term); + virtual void add_term(int net_idx, terminal_t *term) override; - ATTR_HOT virtual nl_double vsolve(); + ATTR_HOT virtual nl_double vsolve() override; ATTR_HOT int solve_non_dynamic(const bool newton_raphson); ATTR_HOT void build_LE_A(); diff --git a/src/lib/netlist/solver/nld_ms_direct1.h b/src/lib/netlist/solver/nld_ms_direct1.h index 9f895a6c3f3..3aa79de45da 100644 --- a/src/lib/netlist/solver/nld_ms_direct1.h +++ b/src/lib/netlist/solver/nld_ms_direct1.h @@ -22,7 +22,7 @@ public: {} ATTR_HOT inline int vsolve_non_dynamic(const bool newton_raphson); protected: - ATTR_HOT virtual nl_double vsolve(); + ATTR_HOT virtual nl_double vsolve() override; private: }; diff --git a/src/lib/netlist/solver/nld_ms_direct2.h b/src/lib/netlist/solver/nld_ms_direct2.h index f78c36770e6..06f00302d3c 100644 --- a/src/lib/netlist/solver/nld_ms_direct2.h +++ b/src/lib/netlist/solver/nld_ms_direct2.h @@ -22,7 +22,7 @@ public: {} ATTR_HOT inline int vsolve_non_dynamic(const bool newton_raphson); protected: - ATTR_HOT virtual nl_double vsolve(); + ATTR_HOT virtual nl_double vsolve() override; private: }; diff --git a/src/lib/netlist/solver/nld_ms_direct_lu.h b/src/lib/netlist/solver/nld_ms_direct_lu.h index d988942058e..877e0b56cd8 100644 --- a/src/lib/netlist/solver/nld_ms_direct_lu.h +++ b/src/lib/netlist/solver/nld_ms_direct_lu.h @@ -30,17 +30,17 @@ public: virtual ~matrix_solver_direct_t(); - virtual void vsetup(analog_net_t::list_t &nets); - virtual void reset() { matrix_solver_t::reset(); } + virtual void vsetup(analog_net_t::list_t &nets) override; + virtual void reset() override { matrix_solver_t::reset(); } ATTR_HOT inline unsigned N() const { if (m_N == 0) return m_dim; else return m_N; } ATTR_HOT inline int vsolve_non_dynamic(const bool newton_raphson); protected: - virtual void add_term(int net_idx, terminal_t *term); + virtual void add_term(int net_idx, terminal_t *term) override; - ATTR_HOT virtual nl_double vsolve(); + ATTR_HOT virtual nl_double vsolve() override; ATTR_HOT int solve_non_dynamic(const bool newton_raphson); ATTR_HOT void build_LE_A(); diff --git a/src/lib/netlist/solver/nld_ms_gmres.h b/src/lib/netlist/solver/nld_ms_gmres.h index 5983cb1a968..6124f7e527d 100644 --- a/src/lib/netlist/solver/nld_ms_gmres.h +++ b/src/lib/netlist/solver/nld_ms_gmres.h @@ -53,10 +53,10 @@ public: delete[] m_v[i]; } - virtual void vsetup(analog_net_t::list_t &nets); + virtual void vsetup(analog_net_t::list_t &nets) override; ATTR_HOT virtual int vsolve_non_dynamic(const bool newton_raphson); protected: - ATTR_HOT virtual nl_double vsolve(); + ATTR_HOT virtual nl_double vsolve() override; private: diff --git a/src/lib/netlist/solver/nld_ms_sor.h b/src/lib/netlist/solver/nld_ms_sor.h index 41074284152..59b1efffca7 100644 --- a/src/lib/netlist/solver/nld_ms_sor.h +++ b/src/lib/netlist/solver/nld_ms_sor.h @@ -32,10 +32,10 @@ public: virtual ~matrix_solver_SOR_t() {} - virtual void vsetup(analog_net_t::list_t &nets); + virtual void vsetup(analog_net_t::list_t &nets) override; ATTR_HOT virtual int vsolve_non_dynamic(const bool newton_raphson); protected: - ATTR_HOT virtual nl_double vsolve(); + ATTR_HOT virtual nl_double vsolve() override; private: nl_double m_lp_fact; diff --git a/src/lib/netlist/solver/nld_ms_sor_mat.h b/src/lib/netlist/solver/nld_ms_sor_mat.h index bbf8706a139..5ef00ae396c 100644 --- a/src/lib/netlist/solver/nld_ms_sor_mat.h +++ b/src/lib/netlist/solver/nld_ms_sor_mat.h @@ -35,11 +35,11 @@ public: virtual ~matrix_solver_SOR_mat_t() {} - virtual void vsetup(analog_net_t::list_t &nets); + virtual void vsetup(analog_net_t::list_t &nets) override; ATTR_HOT inline int vsolve_non_dynamic(const bool newton_raphson); protected: - ATTR_HOT virtual nl_double vsolve(); + ATTR_HOT virtual nl_double vsolve() override; private: nl_double m_Vdelta[_storage_N]; diff --git a/src/lib/netlist/solver/nld_solver.h b/src/lib/netlist/solver/nld_solver.h index 040866c5736..2de12bb77f1 100644 --- a/src/lib/netlist/solver/nld_solver.h +++ b/src/lib/netlist/solver/nld_solver.h @@ -125,9 +125,9 @@ public: } /* netdevice functions */ - ATTR_HOT virtual void update(); - virtual void start(); - virtual void reset(); + ATTR_HOT virtual void update() override; + virtual void start() override; + virtual void reset() override; ATTR_COLD int get_net_idx(net_t *net); @@ -186,15 +186,15 @@ public: virtual ~NETLIB_NAME(solver)(); ATTR_COLD void post_start(); - ATTR_COLD void stop(); + ATTR_COLD void stop() override; ATTR_HOT inline nl_double gmin() { return m_gmin.Value(); } protected: - ATTR_HOT void update(); - ATTR_HOT void start(); - ATTR_HOT void reset(); - ATTR_HOT void update_param(); + ATTR_HOT void update() override; + ATTR_HOT void start() override; + ATTR_HOT void reset() override; + ATTR_HOT void update_param() override; logic_input_t m_fb_step; logic_output_t m_Q_step; diff --git a/src/lib/netlist/tools/nl_convert.h b/src/lib/netlist/tools/nl_convert.h index 7a410bb2f47..3b86c5ec1ad 100644 --- a/src/lib/netlist/tools/nl_convert.h +++ b/src/lib/netlist/tools/nl_convert.h @@ -144,7 +144,7 @@ public: { } - void convert(const pstring &contents); + void convert(const pstring &contents) override; protected: @@ -197,7 +197,7 @@ public: protected: - void verror(const pstring &msg, int line_num, const pstring &line) + void verror(const pstring &msg, int line_num, const pstring &line) override { m_convert.out("{} (line {}): {}\n", msg.cstr(), line_num, line.cstr()); } @@ -207,7 +207,7 @@ public: nl_convert_eagle_t &m_convert; }; - void convert(const pstring &contents); + void convert(const pstring &contents) override; protected: