From 7066028be11e3af3cd80c24a00a2aa84ec9867b3 Mon Sep 17 00:00:00 2001 From: couriersud Date: Sat, 3 Oct 2020 14:41:02 +0200 Subject: [PATCH] netlist: fix VS build. --- src/lib/netlist/plib/pchrono.h | 6 +++--- src/lib/netlist/solver/nld_solver.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) mode change 100644 => 100755 src/lib/netlist/plib/pchrono.h diff --git a/src/lib/netlist/plib/pchrono.h b/src/lib/netlist/plib/pchrono.h old mode 100644 new mode 100755 index ce06fd7b55d..813c3e651f3 --- 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(*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());