diff options
author | 2016-03-21 08:27:06 +0100 | |
---|---|---|
committer | 2016-03-21 08:27:06 +0100 | |
commit | a99df788017c2bf5a56034d4f9152bf8ab95a168 (patch) | |
tree | 3beec27b413c75b8f9f88199519e45fd07959bf8 /src/lib/netlist/devices/nld_system.cpp | |
parent | b224d9a77ad6483daf2b60b75dbdc323a3bcd4b0 (diff) | |
parent | 3afd990226a2c647290579bebb5537bd0fd3faac (diff) |
Merge with master
Diffstat (limited to 'src/lib/netlist/devices/nld_system.cpp')
-rw-r--r-- | src/lib/netlist/devices/nld_system.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/netlist/devices/nld_system.cpp b/src/lib/netlist/devices/nld_system.cpp index ca96f776aac..be2ad3718b0 100644 --- a/src/lib/netlist/devices/nld_system.cpp +++ b/src/lib/netlist/devices/nld_system.cpp @@ -78,7 +78,7 @@ NETLIB_START(extclock) connect_late(m_feedback, m_Q); { netlist_time base = netlist_time::from_hz(m_freq.Value()*2); - pstring_list_t pat(m_pattern.Value(),","); + pstring_vector_t pat(m_pattern.Value(),","); m_off = netlist_time::from_double(m_offset.Value()); int pati[256]; @@ -301,7 +301,7 @@ NETLIB_START(function) for (int i=0; i < m_N; i++) register_input(pfmt("A{1}")(i), m_I[i]); - pstring_list_t cmds(m_func.Value(), " "); + pstring_vector_t cmds(m_func.Value(), " "); m_precompiled.clear(); for (std::size_t i=0; i < cmds.size(); i++) @@ -329,7 +329,7 @@ NETLIB_START(function) if (err) netlist().log().fatal("nld_function: unknown/misformatted token <{1}> in <{2}>", cmd, m_func.Value()); } - m_precompiled.add(rc); + m_precompiled.push_back(rc); } } |