summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author couriersud <couriersud@gmx.org>2020-10-03 14:41:02 +0200
committer couriersud <couriersud@gmx.org>2020-10-03 14:41:17 +0200
commit7066028be11e3af3cd80c24a00a2aa84ec9867b3 (patch)
treecd6544af88cb1cd9e4449d7b4ca5dfafabac9b67
parenta64784a7dbd3428913372df856ac21f6a8b214f7 (diff)
netlist: fix VS build.
-rwxr-xr-x[-rw-r--r--]src/lib/netlist/plib/pchrono.h6
-rw-r--r--src/lib/netlist/solver/nld_solver.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/netlist/plib/pchrono.h b/src/lib/netlist/plib/pchrono.h
index ce06fd7b55d..813c3e651f3 100644..100755
--- a/src/lib/netlist/plib/pchrono.h
+++ b/src/lib/netlist/plib/pchrono.h
@@ -194,8 +194,8 @@ namespace plib {
struct guard_t
{
guard_t() = delete;
- explicit constexpr guard_t(timer &m) noexcept : m_m(m) { m_m.m_time -= T::start(); }
- ~guard_t() noexcept { m_m.m_time += T::stop(); ++m_m.m_count; }
+ explicit constexpr guard_t(timer &m) noexcept : m_m(&m) { m_m->m_time -= T::start(); }
+ ~guard_t() noexcept { m_m->m_time += T::stop(); ++m_m->m_count; }
constexpr guard_t(const guard_t &) = default;
constexpr guard_t &operator=(const guard_t &) = default;
@@ -203,7 +203,7 @@ namespace plib {
constexpr guard_t &operator=(guard_t &&) noexcept = default;
private:
- timer &m_m;
+ timer *m_m;
};
constexpr timer() : m_time(0), m_count(0) { }
diff --git a/src/lib/netlist/solver/nld_solver.cpp b/src/lib/netlist/solver/nld_solver.cpp
index 4993c2e06c0..b475b282eb8 100644
--- a/src/lib/netlist/solver/nld_solver.cpp
+++ b/src/lib/netlist/solver/nld_solver.cpp
@@ -362,7 +362,7 @@ namespace devices
auto &pt = dynamic_cast<terminal_t &>(*term);
// check the connected terminal
const auto *const connected_terminals = nlstate.setup().get_connected_terminals(pt);
- for (const auto *ct = connected_terminals->begin(); *ct != nullptr; ct++)
+ for (auto ct = connected_terminals->begin(); *ct != nullptr; ct++)
{
analog_net_t &connected_net = (*ct)->net();
nlstate.log().verbose(" Connected net {}", connected_net.name());