diff options
Diffstat (limited to 'src/lib/netlist/tools/nl_convert.cpp')
-rw-r--r-- | src/lib/netlist/tools/nl_convert.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/lib/netlist/tools/nl_convert.cpp b/src/lib/netlist/tools/nl_convert.cpp index 393456a67f2..ee6a9827eb3 100644 --- a/src/lib/netlist/tools/nl_convert.cpp +++ b/src/lib/netlist/tools/nl_convert.cpp @@ -112,7 +112,7 @@ nl_convert_base_t::~nl_convert_base_t() void nl_convert_base_t::add_pin_alias(const pstring &devname, const pstring &name, const pstring &alias) { pstring pname = devname + "." + name; - m_pins.emplace(pname, arena::make_unique<pin_alias_t>(pname, devname + "." + alias)); + m_pins.emplace(pname, plib::make_unique<pin_alias_t, arena>(pname, devname + "." + alias)); } void nl_convert_base_t::add_ext_alias(const pstring &alias) @@ -138,15 +138,15 @@ void nl_convert_base_t::add_device(arena::unique_ptr<dev_t> dev) void nl_convert_base_t::add_device(const pstring &atype, const pstring &aname, const pstring &amodel) { - add_device(arena::make_unique<dev_t>(atype, aname, amodel)); + add_device(plib::make_unique<dev_t, arena>(atype, aname, amodel)); } void nl_convert_base_t::add_device(const pstring &atype, const pstring &aname, double aval) { - add_device(arena::make_unique<dev_t>(atype, aname, aval)); + add_device(plib::make_unique<dev_t, arena>(atype, aname, aval)); } void nl_convert_base_t::add_device(const pstring &atype, const pstring &aname) { - add_device(arena::make_unique<dev_t>(atype, aname)); + add_device(plib::make_unique<dev_t, arena>(atype, aname)); } void nl_convert_base_t::add_term(const pstring &netname, const pstring &termname) @@ -161,7 +161,7 @@ void nl_convert_base_t::add_term(const pstring &netname, const pstring &termname net = m_nets[netname].get(); else { - auto nets = arena::make_unique<net_t>(netname); + auto nets = plib::make_unique<net_t, arena>(netname); net = nets.get(); m_nets.emplace(netname, std::move(nets)); } @@ -245,6 +245,7 @@ void nl_convert_base_t::dump_nl() } std::vector<size_t> sorted; + sorted.reserve(m_devs.size()); for (size_t i=0; i < m_devs.size(); i++) sorted.push_back(i); std::sort(sorted.begin(), sorted.end(), @@ -436,7 +437,7 @@ static int npoly(const pstring &s) void nl_convert_spice_t::process_line(const pstring &line) { - if (line != "") + if (!line.empty()) { //printf("// %s\n", line.c_str()); std::vector<pstring> tt(plib::psplit(line, " ", true)); @@ -976,7 +977,7 @@ void nl_convert_rinf_t::convert(const pstring &contents) pstring sim = attr["Simulation"]; pstring val = attr["Value"]; pstring com = attr["Comment"]; - if (val == "") + if (val.empty()) val = com; if (sim == "CAP") |