summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/netlist/prg/nltool.cpp
diff options
context:
space:
mode:
author therealmogminer@gmail.com <therealmogminer@gmail.com>2016-03-21 08:27:06 +0100
committer therealmogminer@gmail.com <therealmogminer@gmail.com>2016-03-21 08:27:06 +0100
commita99df788017c2bf5a56034d4f9152bf8ab95a168 (patch)
tree3beec27b413c75b8f9f88199519e45fd07959bf8 /src/lib/netlist/prg/nltool.cpp
parentb224d9a77ad6483daf2b60b75dbdc323a3bcd4b0 (diff)
parent3afd990226a2c647290579bebb5537bd0fd3faac (diff)
Merge with master
Diffstat (limited to 'src/lib/netlist/prg/nltool.cpp')
-rw-r--r--src/lib/netlist/prg/nltool.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/netlist/prg/nltool.cpp b/src/lib/netlist/prg/nltool.cpp
index 3c7065897e7..ea5211a3c87 100644
--- a/src/lib/netlist/prg/nltool.cpp
+++ b/src/lib/netlist/prg/nltool.cpp
@@ -181,7 +181,7 @@ public:
void log_setup()
{
log().debug("Creating dynamic logs ...\n");
- pstring_list_t ll(m_opts ? m_opts->opt_logs() : "" , ":");
+ pstring_vector_t ll(m_opts ? m_opts->opt_logs() : "" , ":");
for (unsigned i=0; i < ll.size(); i++)
{
pstring name = "log_" + ll[i];
@@ -260,9 +260,9 @@ struct input_t
};
-plist_t<input_t> *read_input(netlist::netlist_t *netlist, pstring fname)
+pvector_t<input_t> *read_input(netlist::netlist_t *netlist, pstring fname)
{
- plist_t<input_t> *ret = palloc(plist_t<input_t>());
+ pvector_t<input_t> *ret = palloc(pvector_t<input_t>());
if (fname != "")
{
pifilestream f(fname);
@@ -272,7 +272,7 @@ plist_t<input_t> *read_input(netlist::netlist_t *netlist, pstring fname)
if (l != "")
{
input_t inp(netlist, l);
- ret->add(inp);
+ ret->push_back(inp);
}
}
}
@@ -294,7 +294,7 @@ static void run(tool_options_t &opts)
nt.read_netlist(opts.opt_file(), opts.opt_name());
- plist_t<input_t> *inps = read_input(&nt, opts.opt_inp());
+ pvector_t<input_t> *inps = read_input(&nt, opts.opt_inp());
double ttr = opts.opt_ttr();