diff options
author | 2022-05-08 17:53:07 +0200 | |
---|---|---|
committer | 2022-05-08 17:53:07 +0200 | |
commit | 5aaae19230bd39dda6766641672f57276a3f9ea1 (patch) | |
tree | 282cfec1d6f12d3af722b69be9739c1c8b49f00d /src/lib/netlist/plib | |
parent | c4b417c98d17f15b3805ec2f530d92ce809dc5c7 (diff) |
netlist: standalone makefile and prototype modifications (#9708)
- update netlist makefile to more recent compilers
- prototypes for NETLISTs in macros are now created create_devinc.py
- apply ctidy recommendations
- Python None in create_device.py
Diffstat (limited to 'src/lib/netlist/plib')
-rw-r--r-- | src/lib/netlist/plib/pdynlib.h | 2 | ||||
-rw-r--r-- | src/lib/netlist/plib/pmatrix2d.h | 4 | ||||
-rw-r--r-- | src/lib/netlist/plib/pmempool.h | 2 | ||||
-rw-r--r-- | src/lib/netlist/plib/pomp.h | 6 | ||||
-rw-r--r-- | src/lib/netlist/plib/ppmf.h | 2 | ||||
-rw-r--r-- | src/lib/netlist/plib/psource.h | 2 | ||||
-rw-r--r-- | src/lib/netlist/plib/pstream.h | 4 | ||||
-rw-r--r-- | src/lib/netlist/plib/ptests.h | 7 | ||||
-rw-r--r-- | src/lib/netlist/plib/ptokenizer.cpp | 8 |
9 files changed, 16 insertions, 21 deletions
diff --git a/src/lib/netlist/plib/pdynlib.h b/src/lib/netlist/plib/pdynlib.h index 5548c56d64b..04a6a354a69 100644 --- a/src/lib/netlist/plib/pdynlib.h +++ b/src/lib/netlist/plib/pdynlib.h @@ -102,8 +102,8 @@ namespace plib { dynproc() : m_sym(nullptr) { } dynproc(dynlib_base &dl, const pstring &name) noexcept + : m_sym(dl.getsym<calltype>(name)) { - m_sym = dl.getsym<calltype>(name); } void load(dynlib_base &dl, const pstring &name) noexcept diff --git a/src/lib/netlist/plib/pmatrix2d.h b/src/lib/netlist/plib/pmatrix2d.h index f818047cdaa..b85352db276 100644 --- a/src/lib/netlist/plib/pmatrix2d.h +++ b/src/lib/netlist/plib/pmatrix2d.h @@ -162,8 +162,8 @@ namespace plib pmatrix2d_vrl(const pmatrix2d_vrl &) = default; pmatrix2d_vrl &operator=(const pmatrix2d_vrl &) = default; - pmatrix2d_vrl(pmatrix2d_vrl &&) = default; - pmatrix2d_vrl &operator=(pmatrix2d_vrl &&) = default; + pmatrix2d_vrl(pmatrix2d_vrl &&) noexcept = default; + pmatrix2d_vrl &operator=(pmatrix2d_vrl &&) noexcept = default; ~pmatrix2d_vrl() = default; diff --git a/src/lib/netlist/plib/pmempool.h b/src/lib/netlist/plib/pmempool.h index 69de70000d9..877e9d906bd 100644 --- a/src/lib/netlist/plib/pmempool.h +++ b/src/lib/netlist/plib/pmempool.h @@ -191,7 +191,7 @@ namespace plib { BASEARENA m_arena; using base_allocator_typex = typename BASEARENA::template allocator_type<std::pair<void * const, info>>; - std::unordered_map<void *, info, std::hash<void *>, std::equal_to<void *>, + std::unordered_map<void *, info, std::hash<void *>, std::equal_to<>, base_allocator_typex> m_info; // std::unordered_map<void *, info> m_info; std::vector<block *, typename BASEARENA::template allocator_type<block *>> m_blocks; diff --git a/src/lib/netlist/plib/pomp.h b/src/lib/netlist/plib/pomp.h index f4fdb34487b..27b4cc74c2a 100644 --- a/src/lib/netlist/plib/pomp.h +++ b/src/lib/netlist/plib/pomp.h @@ -19,8 +19,7 @@ #include "omp.h" #endif -namespace plib { -namespace omp { +namespace plib::omp { template <typename I, class T> void for_static(std::size_t numops, const I start, const I end, const T &what) noexcept(noexcept(what)) @@ -79,7 +78,6 @@ inline std::size_t get_max_threads() noexcept // pdynlib: dynamic loading of libraries ... // ---------------------------------------------------------------------------------------- -} // namespace omp -} // namespace plib +} // namespace plib::omp #endif // PSTRING_H_ diff --git a/src/lib/netlist/plib/ppmf.h b/src/lib/netlist/plib/ppmf.h index 4c175fe8b10..25e88a22eec 100644 --- a/src/lib/netlist/plib/ppmf.h +++ b/src/lib/netlist/plib/ppmf.h @@ -460,11 +460,11 @@ namespace plib { template<typename O> late_pmfp(specific_member_function<O> mftp) + : m_creator(creator<O>) { static_assert(sizeof(m_raw) >= sizeof(specific_member_function<O>), "size issue"); // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast) *reinterpret_cast<specific_member_function<O> *>(&m_raw) = mftp; - m_creator = creator<O>; } template<typename O> diff --git a/src/lib/netlist/plib/psource.h b/src/lib/netlist/plib/psource.h index b6bb1b79048..86bef9a03fd 100644 --- a/src/lib/netlist/plib/psource.h +++ b/src/lib/netlist/plib/psource.h @@ -104,7 +104,7 @@ namespace plib istream_uptr stream(const pstring &name) override { if (name == m_name) - return istream_uptr(std::make_unique<std::stringstream>(putf8string(m_str)), name); + return {std::make_unique<std::stringstream>(putf8string(m_str)), name }; return istream_uptr(); } diff --git a/src/lib/netlist/plib/pstream.h b/src/lib/netlist/plib/pstream.h index 19ef530dee3..4e4d0c9f8bb 100644 --- a/src/lib/netlist/plib/pstream.h +++ b/src/lib/netlist/plib/pstream.h @@ -66,9 +66,9 @@ namespace plib { istream_uptr(const istream_uptr &) = delete; istream_uptr &operator=(const istream_uptr &) = delete; istream_uptr(istream_uptr &&rhs) noexcept + : m_strm(std::move(rhs.m_strm)) + , m_filename(std::move(rhs.m_filename)) { - m_strm = std::move(rhs.m_strm); - m_filename = std::move(rhs.m_filename); } istream_uptr &operator=(istream_uptr &&) /*noexcept*/ = delete; diff --git a/src/lib/netlist/plib/ptests.h b/src/lib/netlist/plib/ptests.h index b91d58c29a7..1aac62997f4 100644 --- a/src/lib/netlist/plib/ptests.h +++ b/src/lib/netlist/plib/ptests.h @@ -70,9 +70,7 @@ catch (...) { std::cout << ptest_f << ":" << __LINE__ << ":1: error: unexpected exception thrown\n"; } \ } else do {} while (0) -namespace plib -{ -namespace testing +namespace plib::testing { class Test @@ -176,8 +174,7 @@ namespace testing #undef DEF_COMP -} // namespace testing -} // namespace plib +} // namespace plib::testing #endif // PTESTS_H_ diff --git a/src/lib/netlist/plib/ptokenizer.cpp b/src/lib/netlist/plib/ptokenizer.cpp index 80db2d0663a..b7031cbed4e 100644 --- a/src/lib/netlist/plib/ptokenizer.cpp +++ b/src/lib/netlist/plib/ptokenizer.cpp @@ -234,7 +234,7 @@ namespace plib { if (eof()) return token_t(token_type::ENDOFFILE); if (c == '\r' || c == '\n') - return token_t(token_type::LINEMARKER, lm); + return { token_type::LINEMARKER, lm }; lm += c; } while (true); } @@ -253,7 +253,7 @@ namespace plib { c = getc(); } ungetc(c); - return token_t(ret, tokstr); + return { ret, tokstr }; } // not a number, try identifier @@ -282,7 +282,7 @@ namespace plib { tokstr += c; c = getc(); } - return token_t(token_type::STRING, tokstr); + return { token_type::STRING, tokstr }; } else { @@ -296,7 +296,7 @@ namespace plib { { auto id = m_tokens.find(tokstr); if (id != m_tokens.end()) - return token_t(id->second, tokstr); + return { id->second, tokstr }; } c = getc(); } |