diff options
author | 2020-09-11 23:15:42 +0200 | |
---|---|---|
committer | 2020-09-11 23:15:42 +0200 | |
commit | 8f48f2d062306db604c334228dbca7897c6f249e (patch) | |
tree | 537917c1ebc20c18a76ec1753e5fbff1b8e91690 | |
parent | 11b66848f30d46e72931503a360f003d9fa63b10 (diff) |
netlist: clang tidy fixes.
-rw-r--r-- | src/lib/netlist/devices/nld_4006.cpp | 2 | ||||
-rwxr-xr-x | src/lib/netlist/plib/pmatrix2d.h | 2 | ||||
-rw-r--r-- | src/lib/netlist/plib/pstream.h | 6 | ||||
-rw-r--r-- | src/lib/netlist/plib/pstring.h | 4 |
4 files changed, 9 insertions, 5 deletions
diff --git a/src/lib/netlist/devices/nld_4006.cpp b/src/lib/netlist/devices/nld_4006.cpp index a61536175f6..7d0deef61ec 100644 --- a/src/lib/netlist/devices/nld_4006.cpp +++ b/src/lib/netlist/devices/nld_4006.cpp @@ -100,7 +100,7 @@ namespace netlist auto d = m_supply.VCC()() - m_supply.GND()(); if (d > 0.1) // avoid unrealistic values { - m_tp = netlist_time::from_nsec(923.0 / d + 13.0); // calculated from datasheet + m_tp = netlist_time::from_nsec(gsl::narrow_cast<unsigned>(923.0 / d + 13.0)); // calculated from datasheet } } diff --git a/src/lib/netlist/plib/pmatrix2d.h b/src/lib/netlist/plib/pmatrix2d.h index 8cbba5aa410..d0fbac26194 100755 --- a/src/lib/netlist/plib/pmatrix2d.h +++ b/src/lib/netlist/plib/pmatrix2d.h @@ -51,6 +51,8 @@ namespace plib ::new(&m_v[i]) T(); } + PCOPYASSIGNMOVE(pmatrix2d, delete) + ~pmatrix2d() { if (m_v != nullptr) diff --git a/src/lib/netlist/plib/pstream.h b/src/lib/netlist/plib/pstream.h index 4488494e381..65d95293298 100644 --- a/src/lib/netlist/plib/pstream.h +++ b/src/lib/netlist/plib/pstream.h @@ -64,13 +64,15 @@ namespace plib { } istream_uptr(const istream_uptr &) = delete; istream_uptr &operator=(const istream_uptr &) = delete; - istream_uptr(istream_uptr &&rhs) /*noexcept*/ + istream_uptr(istream_uptr &&rhs) { m_strm = std::move(rhs.m_strm); - m_filename = rhs.m_filename; + m_filename = std::move(rhs.m_filename); } istream_uptr &operator=(istream_uptr &&) /*noexcept*/ = delete; + ~istream_uptr() = default; + std::istream * operator ->() noexcept { return m_strm.get(); } std::istream & operator *() noexcept { return *m_strm; } pstring filename() { return m_filename; } diff --git a/src/lib/netlist/plib/pstring.h b/src/lib/netlist/plib/pstring.h index c9c07ab738d..9a58e75fbd3 100644 --- a/src/lib/netlist/plib/pstring.h +++ b/src/lib/netlist/plib/pstring.h @@ -284,7 +284,7 @@ struct putf_traits<1, CT> static constexpr code_t code(const mem_t *p) noexcept { - const auto *p1 = reinterpret_cast<const unsigned char *>(p); // NOLINT(cppcoreguidelines-pro-type-reinterpret) + const auto *p1 = reinterpret_cast<const unsigned char *>(p); // NOLINT(cppcoreguidelines-pro-type-reinterpret-cast) return ((*p1 & 0x80) == 0x00) ? *p1 : // NOLINT ((*p1 & 0xE0) == 0xC0) ? static_cast<code_t>(((p1[0] & 0x3f) << 6) | (p1[1] & 0x3f)) : // NOLINT ((*p1 & 0xF0) == 0xE0) ? static_cast<code_t>(((p1[0] & 0x1f) << 12) | ((p1[1] & 0x3f) << 6) | ((p1[2] & 0x3f) << 0)) : // NOLINT @@ -463,7 +463,7 @@ pstring_t<F>::pstring_t(C *string) { m_str.clear(); putf8string utf8(string); - for (auto &c : utf8) + for (const auto &c : utf8) *this += c; } |