diff options
author | couriersud <couriersud@gmx.org> | 2017-01-27 09:13:00 +0100 |
---|---|---|
committer | couriersud <couriersud@gmx.org> | 2017-01-27 15:22:19 +0100 |
commit | 2e5d1c6cb3a406ba5727b712b4819591696897c9 (patch) | |
tree | d3395cff0232b901d3318e783fd68ac9bbacd9d3 /src/lib/netlist/nl_base.h | |
parent | 6d2354264a7d92e1a1d9163eec9e2c9df239b159 (diff) |
Remove macro to avoid copying and replace with a struct. (nw)
Diffstat (limited to 'src/lib/netlist/nl_base.h')
-rw-r--r-- | src/lib/netlist/nl_base.h | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h index 307afd57788..15cb6e0e7c7 100644 --- a/src/lib/netlist/nl_base.h +++ b/src/lib/netlist/nl_base.h @@ -383,7 +383,6 @@ namespace netlist */ class detail::object_t { - P_PREVENT_COPYING(object_t) public: /*! Constructor. @@ -435,7 +434,6 @@ namespace netlist */ class detail::device_object_t : public detail::object_t { - P_PREVENT_COPYING(device_object_t) public: /*! Constructor. * @@ -470,7 +468,6 @@ namespace netlist */ class detail::core_terminal_t : public device_object_t, public plib::linkedlist_t<core_terminal_t>::element_t { - P_PREVENT_COPYING(core_terminal_t) public: using list_t = std::vector<core_terminal_t *>; @@ -549,7 +546,6 @@ namespace netlist class terminal_t : public analog_t { - P_PREVENT_COPYING(terminal_t) public: terminal_t(core_device_t &dev, const pstring &aname); @@ -699,7 +695,6 @@ namespace netlist public detail::object_t, public detail::netlist_ref { - P_PREVENT_COPYING(net_t) public: net_t(netlist_t &nl, const pstring &aname, core_terminal_t *mr = nullptr); @@ -760,7 +755,6 @@ namespace netlist class logic_net_t : public detail::net_t { - P_PREVENT_COPYING(logic_net_t) public: logic_net_t(netlist_t &nl, const pstring &aname, detail::core_terminal_t *mr = nullptr); @@ -801,7 +795,6 @@ namespace netlist class analog_net_t : public detail::net_t { - P_PREVENT_COPYING(analog_net_t) public: using list_t = std::vector<analog_net_t *>; @@ -827,7 +820,6 @@ namespace netlist class logic_output_t : public logic_t { - P_PREVENT_COPYING(logic_output_t) public: logic_output_t(core_device_t &dev, const pstring &aname); @@ -846,7 +838,6 @@ namespace netlist class analog_output_t : public analog_t { - P_PREVENT_COPYING(analog_output_t) public: analog_output_t(core_device_t &dev, const pstring &aname); virtual ~analog_output_t(); @@ -865,7 +856,6 @@ namespace netlist class param_t : public detail::device_object_t { - P_PREVENT_COPYING(param_t) public: enum param_type_t { @@ -1035,7 +1025,6 @@ namespace netlist public logic_family_t, public detail::netlist_ref { - P_PREVENT_COPYING(core_device_t) public: core_device_t(netlist_t &owner, const pstring &name); core_device_t(core_device_t &owner, const pstring &name); @@ -1115,7 +1104,6 @@ namespace netlist class device_t : public core_device_t { - P_PREVENT_COPYING(device_t) public: template <class C> @@ -1197,9 +1185,8 @@ namespace netlist // ----------------------------------------------------------------------------- - class netlist_t : public plib::plog_dispatch_intf + class netlist_t : public plib::plog_dispatch_intf, private plib::nocopyassignmove { - P_PREVENT_COPYING(netlist_t) public: explicit netlist_t(const pstring &aname); @@ -1319,8 +1306,6 @@ namespace netlist // performance nperftime_t m_stat_mainloop; nperfcount_t m_perf_out_processed; - nperfcount_t m_perf_inp_processed; - nperfcount_t m_perf_inp_active; std::vector<plib::owned_ptr<core_device_t>> m_devices; }; |