diff options
author | couriersud <couriersud@gmx.org> | 2019-02-20 20:53:56 +0100 |
---|---|---|
committer | couriersud <couriersud@gmx.org> | 2019-02-20 20:53:56 +0100 |
commit | 064050323eceb9360898214f5ea7de2f9162cb06 (patch) | |
tree | 5ab0624cd8a3d0a97172b92812b54c92e9fcd383 | |
parent | a5f37870584dc8bd5588ee32964f56462228a714 (diff) |
netlist: fix access specifiers. (nw)
-rw-r--r-- | src/lib/netlist/analog/nlid_fourterm.h | 9 | ||||
-rw-r--r-- | src/lib/netlist/analog/nlid_twoterm.h | 10 | ||||
-rw-r--r-- | src/lib/netlist/nl_base.h | 12 |
3 files changed, 17 insertions, 14 deletions
diff --git a/src/lib/netlist/analog/nlid_fourterm.h b/src/lib/netlist/analog/nlid_fourterm.h index 016f5403c47..46ee7d6e54a 100644 --- a/src/lib/netlist/analog/nlid_fourterm.h +++ b/src/lib/netlist/analog/nlid_fourterm.h @@ -54,11 +54,12 @@ namespace netlist { m_gfac = plib::constants<nl_double>::one(); } + NETLIB_RESETI(); + param_double_t m_G; param_double_t m_RI; protected: - NETLIB_RESETI(); NETLIB_UPDATEI(); NETLIB_UPDATE_PARAMI() { @@ -132,9 +133,10 @@ namespace netlist { m_gfac = plib::constants<nl_double>::one() / m_RI(); } + NETLIB_RESETI(); + protected: //NETLIB_UPDATEI(); - NETLIB_RESETI(); NETLIB_UPDATE_PARAMI(); }; @@ -179,11 +181,12 @@ namespace netlist { connect(m_ON2, m_ON1); } + NETLIB_RESETI(); + param_double_t m_RO; protected: //NETLIB_UPDATEI(); - NETLIB_RESETI(); //NETLIB_UPDATE_PARAMI(); terminal_t m_OP2; diff --git a/src/lib/netlist/analog/nlid_twoterm.h b/src/lib/netlist/analog/nlid_twoterm.h index 4c48e1a5370..65451a03c6c 100644 --- a/src/lib/netlist/analog/nlid_twoterm.h +++ b/src/lib/netlist/analog/nlid_twoterm.h @@ -120,7 +120,6 @@ NETLIB_OBJECT_DERIVED(R_base, twoterm) { } -public: void set_R(const nl_double R) { const nl_double G = plib::constants<nl_double>::one() / R; @@ -128,8 +127,9 @@ public: -G, G, 0.0); } -protected: NETLIB_RESETI(); + +protected: //NETLIB_UPDATEI(); }; @@ -235,9 +235,9 @@ public: NETLIB_TIMESTEPI(); param_double_t m_C; + NETLIB_RESETI(); protected: - NETLIB_RESETI(); //NETLIB_UPDATEI(); NETLIB_UPDATE_PARAMI(); @@ -265,11 +265,11 @@ public: NETLIB_IS_TIMESTEP(true) NETLIB_TIMESTEPI(); + NETLIB_RESETI(); param_double_t m_L; protected: - NETLIB_RESETI(); //NETLIB_UPDATEI(); NETLIB_UPDATE_PARAMI(); @@ -381,11 +381,11 @@ public: NETLIB_IS_DYNAMIC(true) NETLIB_UPDATE_TERMINALSI(); + NETLIB_RESETI(); diode_model_t m_model; protected: - NETLIB_RESETI(); //NETLIB_UPDATEI(); NETLIB_UPDATE_PARAMI(); diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h index dc33e8c6698..5975eaa4011 100644 --- a/src/lib/netlist/nl_base.h +++ b/src/lib/netlist/nl_base.h @@ -30,7 +30,7 @@ #include "nl_time.h" //============================================================ -// MACROS / New Syntax +// MACROS / New Syntax999 //============================================================ /*! Construct a netlist device name */ @@ -130,11 +130,11 @@ class NETLIB_NAME(name) : public device_t #define NETLIB_DELEGATE(chip, name) nldelegate(&NETLIB_NAME(chip) :: name, this) -#define NETLIB_UPDATE_TERMINALSI() public: virtual void update_terminals() override -#define NETLIB_HANDLERI(name) private: virtual void name() NL_NOEXCEPT -#define NETLIB_UPDATEI() public: virtual void update() NL_NOEXCEPT override -#define NETLIB_UPDATE_PARAMI() public: virtual void update_param() override -#define NETLIB_RESETI() public: virtual void reset() override +#define NETLIB_UPDATE_TERMINALSI() virtual void update_terminals() override +#define NETLIB_HANDLERI(name) virtual void name() NL_NOEXCEPT +#define NETLIB_UPDATEI() virtual void update() NL_NOEXCEPT override +#define NETLIB_UPDATE_PARAMI() virtual void update_param() override +#define NETLIB_RESETI() virtual void reset() override #define NETLIB_TIMESTEP(chip) void NETLIB_NAME(chip) :: timestep(const nl_double step) |