From 23c0490019ea90a33eb2b06ff9eb617e56357f13 Mon Sep 17 00:00:00 2001 From: couriersud Date: Sat, 13 Jun 2020 23:26:21 +0200 Subject: netlist: fix some clang-tidy warnings. (nw) --- src/lib/netlist/generated/static_solvers.cpp | 4 ++-- src/lib/netlist/nl_base.cpp | 1 + src/lib/netlist/prg/nltool.cpp | 8 ++++---- src/lib/netlist/tools/nl_convert.h | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/lib/netlist/generated/static_solvers.cpp b/src/lib/netlist/generated/static_solvers.cpp index 54f87598b0d..3c4a445b6b3 100644 --- a/src/lib/netlist/generated/static_solvers.cpp +++ b/src/lib/netlist/generated/static_solvers.cpp @@ -17951,8 +17951,8 @@ static void nl_gcr_f6a620d52ca4719f_7_double_double(double * __restrict V, const V[0] = (RHS0 - tmp0) / m_A0; } -extern plib::dynlib_static_sym nl_static_solver_syms[]; -plib::dynlib_static_sym nl_static_solver_syms[] = { +extern const plib::dynlib_static_sym nl_static_solver_syms[]; +const plib::dynlib_static_sym nl_static_solver_syms[] = { // konami1x {"nl_gcr_105d3ecb773843b6_49_double_double", reinterpret_cast(&nl_gcr_105d3ecb773843b6_49_double_double)}, // breakout diff --git a/src/lib/netlist/nl_base.cpp b/src/lib/netlist/nl_base.cpp index a9ac57f620d..c57e4f5e1c8 100644 --- a/src/lib/netlist/nl_base.cpp +++ b/src/lib/netlist/nl_base.cpp @@ -324,6 +324,7 @@ namespace netlist t.push_back(&term->delegate()); term->run_delegate(); } + // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast) auto *dev = reinterpret_cast(term->delegate().object()); if (!plib::container::contains(d, dev)) d.push_back(dev); diff --git a/src/lib/netlist/prg/nltool.cpp b/src/lib/netlist/prg/nltool.cpp index a7eaa6927a9..8b642c4b840 100644 --- a/src/lib/netlist/prg/nltool.cpp +++ b/src/lib/netlist/prg/nltool.cpp @@ -27,7 +27,7 @@ #define NL_DISABLE_DYNAMIC_LOAD 0 #endif -extern plib::dynlib_static_sym nl_static_solver_syms[]; +extern const plib::dynlib_static_sym nl_static_solver_syms[]; class tool_app_t : public plib::app { @@ -668,8 +668,8 @@ void tool_app_t::static_compile() sout << "// " << e.second.m_module << "\n"; sout << e.second.m_code; } - sout << "extern plib::dynlib_static_sym nl_static_solver_syms[];\n"; - sout << "plib::dynlib_static_sym nl_static_solver_syms[] = {\n"; + sout << "extern const plib::dynlib_static_sym nl_static_solver_syms[];\n"; + sout << "const plib::dynlib_static_sym nl_static_solver_syms[] = {\n"; for (auto &e : map) { sout << "// " << e.second.m_module << "\n"; @@ -1066,7 +1066,7 @@ void tool_app_t::listdevices() { pstring out = plib::pfmt("{1:-20} {2}(")(fl->name())(fl->name()); - netlist::factory::element_t *f; + netlist::factory::element_t *f = nullptr; nt.parser().register_dev(fl->name(), fl->name() + "_lc", std::vector(), &f); diff --git a/src/lib/netlist/tools/nl_convert.h b/src/lib/netlist/tools/nl_convert.h index a62a23b403f..185216b3a09 100755 --- a/src/lib/netlist/tools/nl_convert.h +++ b/src/lib/netlist/tools/nl_convert.h @@ -132,7 +132,7 @@ private: double value() const { return m_val;} const str_list &extra() const { return m_extra;} - bool has_model() const { return m_model != ""; } + bool has_model() const { return !m_model.empty(); } bool has_value() const { return m_has_val; } void add_extra(const pstring &s) { m_extra.push_back(s); } -- cgit v1.2.3