diff options
Diffstat (limited to 'src/lib/netlist/solver')
-rw-r--r-- | src/lib/netlist/solver/nld_matrix_solver.cpp | 4 | ||||
-rw-r--r-- | src/lib/netlist/solver/nld_matrix_solver.h | 2 | ||||
-rw-r--r-- | src/lib/netlist/solver/nld_ms_direct.h | 4 | ||||
-rw-r--r-- | src/lib/netlist/solver/nld_ms_gcr.h | 2 | ||||
-rw-r--r-- | src/lib/netlist/solver/nld_solver.cpp | 2 |
5 files changed, 6 insertions, 8 deletions
diff --git a/src/lib/netlist/solver/nld_matrix_solver.cpp b/src/lib/netlist/solver/nld_matrix_solver.cpp index 951ae526999..f6d9c0c579b 100644 --- a/src/lib/netlist/solver/nld_matrix_solver.cpp +++ b/src/lib/netlist/solver/nld_matrix_solver.cpp @@ -433,7 +433,7 @@ namespace solver d->timestep(dd); } - const netlist_time matrix_solver_t::solve(netlist_time_ext now) + netlist_time matrix_solver_t::solve(netlist_time_ext now) { const netlist_time_ext delta = now - m_last_step(); @@ -561,10 +561,8 @@ namespace solver { m_terms[net_idx].add_terminal(term, ot, true); } - // Should this be allowed ? else { - m_rails_temp[net_idx].add_terminal(term, ot, true); log().fatal(MF_FOUND_TERM_WITH_MISSING_OTHERNET(term->name())); throw nl_exception(MF_FOUND_TERM_WITH_MISSING_OTHERNET(term->name())); } diff --git a/src/lib/netlist/solver/nld_matrix_solver.h b/src/lib/netlist/solver/nld_matrix_solver.h index cc63af716d6..a6b3c6774fd 100644 --- a/src/lib/netlist/solver/nld_matrix_solver.h +++ b/src/lib/netlist/solver/nld_matrix_solver.h @@ -177,7 +177,7 @@ namespace solver // after every call to solve, update inputs must be called. // this can be done as well as a batch to ease parallel processing. - const netlist_time solve(netlist_time_ext now); + netlist_time solve(netlist_time_ext now); void update_inputs(); bool has_dynamic_devices() const noexcept { return !m_dynamic_devices.empty(); } diff --git a/src/lib/netlist/solver/nld_ms_direct.h b/src/lib/netlist/solver/nld_ms_direct.h index 806e56764ba..fbb8e4a8250 100644 --- a/src/lib/netlist/solver/nld_ms_direct.h +++ b/src/lib/netlist/solver/nld_ms_direct.h @@ -30,7 +30,7 @@ namespace solver matrix_solver_direct_t(netlist_state_t &anetlist, const pstring &name, const analog_net_t::list_t &nets, - const solver_parameters_t *params, const std::size_t size); + const solver_parameters_t *params, std::size_t size); void reset() override { matrix_solver_t::reset(); } @@ -184,7 +184,7 @@ namespace solver matrix_solver_direct_t<FT, SIZE>::matrix_solver_direct_t(netlist_state_t &anetlist, const pstring &name, const analog_net_t::list_t &nets, const solver_parameters_t *params, - const std::size_t size) + std::size_t size) : matrix_solver_ext_t<FT, SIZE>(anetlist, name, nets, params, size) , m_pitch(m_pitch_ABS ? m_pitch_ABS : (((size + 0) + 7) / 8) * 8) , m_A(size, m_pitch) diff --git a/src/lib/netlist/solver/nld_ms_gcr.h b/src/lib/netlist/solver/nld_ms_gcr.h index f63a24a8ccb..be3fd5fa524 100644 --- a/src/lib/netlist/solver/nld_ms_gcr.h +++ b/src/lib/netlist/solver/nld_ms_gcr.h @@ -146,7 +146,7 @@ namespace solver { const auto &nzbd = this->m_terms[i].m_nzbd; - if (nzbd.size() > 0) + if (!nzbd.empty()) { std::size_t pi = mat.diag[i]; diff --git a/src/lib/netlist/solver/nld_solver.cpp b/src/lib/netlist/solver/nld_solver.cpp index a4eedc38ed7..977b6ae7b20 100644 --- a/src/lib/netlist/solver/nld_solver.cpp +++ b/src/lib/netlist/solver/nld_solver.cpp @@ -291,7 +291,7 @@ namespace devices // process all terminals connected to this net for (auto &term : n.core_terms()) { - netlist.log().verbose("Term {} {}", term->name(), (int) term->type()); + netlist.log().verbose("Term {} {}", term->name(), static_cast<int>(term->type())); // only process analog terminals if (term->is_type(detail::terminal_type::TERMINAL)) { |