diff options
Diffstat (limited to 'src/lib/netlist/nl_base.cpp')
-rw-r--r-- | src/lib/netlist/nl_base.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/lib/netlist/nl_base.cpp b/src/lib/netlist/nl_base.cpp index 5085f38d53b..f7629065ff4 100644 --- a/src/lib/netlist/nl_base.cpp +++ b/src/lib/netlist/nl_base.cpp @@ -64,9 +64,9 @@ public: m_R_low = 1.0; m_R_high = 130.0; } - virtual powned_ptr<devices::nld_base_d_to_a_proxy> create_d_a_proxy(netlist_t &anetlist, const pstring &name, logic_output_t *proxied) const override + virtual plib::powned_ptr<devices::nld_base_d_to_a_proxy> create_d_a_proxy(netlist_t &anetlist, const pstring &name, logic_output_t *proxied) const override { - return powned_ptr<devices::nld_base_d_to_a_proxy>::Create<devices::nld_d_to_a_proxy>(anetlist, name, proxied); + return plib::powned_ptr<devices::nld_base_d_to_a_proxy>::Create<devices::nld_d_to_a_proxy>(anetlist, name, proxied); } }; @@ -84,9 +84,9 @@ public: m_R_low = 10.0; m_R_high = 10.0; } - virtual powned_ptr<devices::nld_base_d_to_a_proxy> create_d_a_proxy(netlist_t &anetlist, const pstring &name, logic_output_t *proxied) const override + virtual plib::powned_ptr<devices::nld_base_d_to_a_proxy> create_d_a_proxy(netlist_t &anetlist, const pstring &name, logic_output_t *proxied) const override { - return powned_ptr<devices::nld_base_d_to_a_proxy>::Create<devices::nld_d_to_a_proxy>(anetlist, name, proxied); + return plib::powned_ptr<devices::nld_base_d_to_a_proxy>::Create<devices::nld_d_to_a_proxy>(anetlist, name, proxied); } }; @@ -108,14 +108,14 @@ const logic_family_desc_t *family_CD4XXX() queue_t::queue_t(netlist_t &nl) : timed_queue<net_t *, netlist_time>(512) , object_t(nl, "QUEUE", QUEUE) - , pstate_callback_t() + , plib::pstate_callback_t() , m_qsize(0) , m_times(512) , m_names(512) { } -void queue_t::register_state(pstate_manager_t &manager, const pstring &module) +void queue_t::register_state(plib::pstate_manager_t &manager, const pstring &module) { netlist().log().debug("register_state\n"); manager.save_item(m_qsize, this, module + "." + "qsize"); @@ -228,7 +228,7 @@ netlist_t::netlist_t(const pstring &aname) m_log(this), m_lib(nullptr) { - save_item(static_cast<pstate_callback_t &>(m_queue), this, "m_queue"); + save_item(static_cast<plib::pstate_callback_t &>(m_queue), this, "m_queue"); save_item(m_time, this, "m_time"); } @@ -253,7 +253,7 @@ ATTR_COLD void netlist_t::start() pstring libpath = nl_util::environment("NL_BOOSTLIB", nl_util::buildpath({".", "nlboost.so"})); - m_lib = palloc<plib::dynlib>(libpath); + m_lib = plib::palloc<plib::dynlib>(libpath); /* make sure the solver and parameters are started first! */ @@ -264,7 +264,7 @@ ATTR_COLD void netlist_t::start() || setup().factory().is_class<devices::NETLIB_NAME(gnd)>(e.second) || setup().factory().is_class<devices::NETLIB_NAME(netlistparams)>(e.second)) { - auto dev = powned_ptr<device_t>(e.second->Create(*this, e.first)); + auto dev = plib::powned_ptr<device_t>(e.second->Create(*this, e.first)); setup().register_dev_s(std::move(dev)); } } @@ -287,7 +287,7 @@ ATTR_COLD void netlist_t::start() && !setup().factory().is_class<devices::NETLIB_NAME(gnd)>(e.second) && !setup().factory().is_class<devices::NETLIB_NAME(netlistparams)>(e.second)) { - auto dev = powned_ptr<device_t>(e.second->Create(*this, e.first)); + auto dev = plib::powned_ptr<device_t>(e.second->Create(*this, e.first)); setup().register_dev_s(std::move(dev)); } } @@ -495,7 +495,7 @@ ATTR_COLD core_device_t::core_device_t(core_device_t &owner, const pstring &name if (logic_family() == nullptr) set_logic_family(family_TTL()); init_object(owner.netlist(), owner.name() + "." + name); - owner.netlist().m_devices.push_back(powned_ptr<core_device_t>(this, false)); + owner.netlist().m_devices.push_back(plib::powned_ptr<core_device_t>(this, false)); } ATTR_COLD core_device_t::~core_device_t() @@ -514,7 +514,7 @@ ATTR_COLD void core_device_t::set_delegate_pointer() void (core_device_t::* pFunc)() = &core_device_t::update; m_static_update = reinterpret_cast<net_update_delegate>((this->*pFunc)); #elif (NL_PMF_TYPE == NL_PMF_TYPE_INTERNAL) - m_static_update = pmfp::get_mfp<net_update_delegate>(&core_device_t::update, this); + m_static_update = plib::mfp::get_mfp<net_update_delegate>(&core_device_t::update, this); #endif } @@ -866,7 +866,7 @@ ATTR_COLD void analog_net_t::save_register() net_t::save_register(); } -ATTR_COLD bool analog_net_t::already_processed(pvector_t<list_t> &groups) +ATTR_COLD bool analog_net_t::already_processed(plib::pvector_t<list_t> &groups) { if (isRailNet()) return true; @@ -878,7 +878,7 @@ ATTR_COLD bool analog_net_t::already_processed(pvector_t<list_t> &groups) return false; } -ATTR_COLD void analog_net_t::process_net(pvector_t<list_t> &groups) +ATTR_COLD void analog_net_t::process_net(plib::pvector_t<list_t> &groups) { if (num_cons() == 0) return; |