diff options
Diffstat (limited to 'src/lib/netlist/plib')
-rw-r--r-- | src/lib/netlist/plib/parray.h | 6 | ||||
-rw-r--r-- | src/lib/netlist/plib/pchrono.h | 6 | ||||
-rw-r--r-- | src/lib/netlist/plib/pdynlib.cpp | 7 | ||||
-rw-r--r-- | src/lib/netlist/plib/pdynlib.h | 12 | ||||
-rw-r--r-- | src/lib/netlist/plib/pstring.cpp | 6 | ||||
-rw-r--r-- | src/lib/netlist/plib/pstring.h | 82 | ||||
-rw-r--r-- | src/lib/netlist/plib/ptypes.h | 12 |
7 files changed, 63 insertions, 68 deletions
diff --git a/src/lib/netlist/plib/parray.h b/src/lib/netlist/plib/parray.h index ea240faaac7..c60698d10e1 100644 --- a/src/lib/netlist/plib/parray.h +++ b/src/lib/netlist/plib/parray.h @@ -24,14 +24,14 @@ namespace plib { template <typename FT, int SIZE> struct sizeabs { - static constexpr std::size_t ABS() { return (SIZE < 0) ? static_cast<std::size_t>(0 - SIZE) : static_cast<std::size_t>(SIZE); } + static constexpr std::size_t ABS() noexcept { return (SIZE < 0) ? static_cast<std::size_t>(0 - SIZE) : static_cast<std::size_t>(SIZE); } using container = typename std::array<FT, ABS()> ; }; template <typename FT> struct sizeabs<FT, 0> { - static constexpr std::size_t ABS() { return 0; } + static constexpr std::size_t ABS() noexcept { return 0; } //using container = typename std::vector<FT, arena_allocator<mempool, FT, 64>>; using container = typename std::vector<FT, aligned_allocator<FT, PALIGN_VECTOROPT>>; }; @@ -55,7 +55,7 @@ namespace plib { struct parray { public: - static constexpr std::size_t SIZEABS() { return sizeabs<FT, SIZE>::ABS(); } + static constexpr std::size_t SIZEABS() noexcept { return sizeabs<FT, SIZE>::ABS(); } using base_type = typename sizeabs<FT, SIZE>::container; using size_type = typename base_type::size_type; diff --git a/src/lib/netlist/plib/pchrono.h b/src/lib/netlist/plib/pchrono.h index 640921e15d8..08738f98a9d 100644 --- a/src/lib/netlist/plib/pchrono.h +++ b/src/lib/netlist/plib/pchrono.h @@ -194,7 +194,7 @@ namespace plib { { guard_t() = delete; explicit guard_t(timer &m) noexcept : m_m(m) { m_m.m_time -= T::start(); } - ~guard_t() { m_m.m_time += T::stop(); ++m_m.m_count; } + ~guard_t() noexcept { m_m.m_time += T::stop(); ++m_m.m_count; } COPYASSIGNMOVE(guard_t, default) @@ -208,7 +208,7 @@ namespace plib { type operator()() const { return m_time; } - void reset() { m_time = 0; m_count = 0; } + void reset() noexcept { m_time = 0; m_count = 0; } type average() const noexcept { return (m_count == 0) ? 0 : m_time / m_count; } type total() const noexcept { return m_time; } ctype count() const noexcept { return m_count; } @@ -237,7 +237,7 @@ namespace plib { // unused local variable. // NOLINTNEXTLINE(modernize-use-equals-default) - ~guard_t() { } + ~guard_t() noexcept { } }; constexpr type operator()() const noexcept { return 0; } diff --git a/src/lib/netlist/plib/pdynlib.cpp b/src/lib/netlist/plib/pdynlib.cpp index a569d36dad5..d92e0b471d0 100644 --- a/src/lib/netlist/plib/pdynlib.cpp +++ b/src/lib/netlist/plib/pdynlib.cpp @@ -132,12 +132,7 @@ dynlib::~dynlib() } } -bool dynlib::isLoaded() const -{ - return m_isLoaded; -} - -void *dynlib::getsym_p(const pstring &name) +void *dynlib::getsym_p(const pstring &name) const noexcept { #ifdef _WIN32 return (void *) GetProcAddress((HMODULE) m_lib, name.c_str()); diff --git a/src/lib/netlist/plib/pdynlib.h b/src/lib/netlist/plib/pdynlib.h index b776d8e9b89..9c44452d16f 100644 --- a/src/lib/netlist/plib/pdynlib.h +++ b/src/lib/netlist/plib/pdynlib.h @@ -25,15 +25,15 @@ public: ~dynlib(); COPYASSIGNMOVE(dynlib, delete) - bool isLoaded() const; + bool isLoaded() const { return m_isLoaded; } template <typename T> - T getsym(const pstring &name) + T getsym(const pstring &name) const noexcept { return reinterpret_cast<T>(getsym_p(name)); } private: - void *getsym_p(const pstring &name); + void *getsym_p(const pstring &name) const noexcept; bool m_isLoaded; void *m_lib; @@ -47,12 +47,12 @@ public: dynproc() : m_sym(nullptr) { } - dynproc(dynlib &dl, const pstring &name) + dynproc(dynlib &dl, const pstring &name) noexcept { m_sym = dl.getsym<calltype>(name); } - void load(dynlib &dl, const pstring &name) + void load(dynlib &dl, const pstring &name) noexcept { m_sym = dl.getsym<calltype>(name); } @@ -63,7 +63,7 @@ public: //return m_sym(args...); } - bool resolved() const { return m_sym != nullptr; } + bool resolved() const noexcept { return m_sym != nullptr; } private: calltype m_sym; }; diff --git a/src/lib/netlist/plib/pstring.cpp b/src/lib/netlist/plib/pstring.cpp index 7af1228ef6d..b6ec39c25ed 100644 --- a/src/lib/netlist/plib/pstring.cpp +++ b/src/lib/netlist/plib/pstring.cpp @@ -10,7 +10,7 @@ #include <stack> template<typename F> -int pstring_t<F>::compare(const pstring_t &right) const +int pstring_t<F>::compare(const pstring_t &right) const noexcept { if (mem_t_size() == 0 && right.mem_t_size() == 0) return 0; @@ -54,7 +54,7 @@ pstring_t<F> pstring_t<F>::substr(size_type start, size_type nlen) const } template<typename F> -typename pstring_t<F>::size_type pstring_t<F>::find(const pstring_t &search, size_type start) const +typename pstring_t<F>::size_type pstring_t<F>::find(const pstring_t &search, size_type start) const noexcept { auto istart = std::next(begin(), static_cast<difference_type>(start)); for (; istart != end(); ++istart) @@ -74,7 +74,7 @@ typename pstring_t<F>::size_type pstring_t<F>::find(const pstring_t &search, siz } template<typename F> -typename pstring_t<F>::size_type pstring_t<F>::find(code_t search, size_type start) const +typename pstring_t<F>::size_type pstring_t<F>::find(code_t search, size_type start) const noexcept { pstring_t ss; traits_type::encode(search, ss.m_str); diff --git a/src/lib/netlist/plib/pstring.h b/src/lib/netlist/plib/pstring.h index 5c2ac2b9c47..4a9d99300bb 100644 --- a/src/lib/netlist/plib/pstring.h +++ b/src/lib/netlist/plib/pstring.h @@ -161,26 +161,26 @@ public: using iterator = pstring_const_iterator<pstring_t<F> >; using const_iterator = pstring_const_iterator<pstring_t<F> >; - iterator begin() { return iterator(m_str.begin()); } - iterator end() { return iterator(m_str.end()); } - const_iterator begin() const { return const_iterator(m_str.begin()); } - const_iterator end() const { return const_iterator(m_str.end()); } - const_iterator cbegin() const { return const_iterator(m_str.begin()); } - const_iterator cend() const { return const_iterator(m_str.end()); } + iterator begin() noexcept { return iterator(m_str.begin()); } + iterator end() noexcept { return iterator(m_str.end()); } + const_iterator begin() const noexcept { return const_iterator(m_str.begin()); } + const_iterator end() const noexcept { return const_iterator(m_str.end()); } + const_iterator cbegin() const noexcept { return const_iterator(m_str.begin()); } + const_iterator cend() const noexcept { return const_iterator(m_str.end()); } // C string conversion helpers - const mem_t *c_str() const { return static_cast<const mem_t *>(m_str.c_str()); } - const mem_t *data() const { return c_str(); } + const mem_t *c_str() const noexcept { return static_cast<const mem_t *>(m_str.c_str()); } + const mem_t *data() const noexcept { return c_str(); } - size_type length() const { return traits_type::len(m_str); } - size_type size() const { return traits_type::len(m_str); } - bool empty() const { return m_str.size() == 0; } + size_type length() const noexcept { return traits_type::len(m_str); } + size_type size() const noexcept { return traits_type::len(m_str); } + bool empty() const noexcept { return m_str.size() == 0; } pstring_t substr(size_type start, size_type nlen = npos) const; - int compare(const pstring_t &right) const; + int compare(const pstring_t &right) const noexcept; - size_type find(const pstring_t &search, size_type start = 0) const; - size_type find(code_t search, size_type start = 0) const; + size_type find(const pstring_t &search, size_type start = 0) const noexcept; + size_type find(code_t search, size_type start = 0) const noexcept; // concatenation operators pstring_t& operator+=(const pstring_t &string) { m_str.append(string.m_str); return *this; } @@ -190,13 +190,13 @@ public: friend pstring_t operator+(const code_t lhs, const pstring_t &rhs) { return pstring_t(1, lhs) += rhs; } // comparison operators - bool operator==(const pstring_t &string) const { return (compare(string) == 0); } - bool operator!=(const pstring_t &string) const { return (compare(string) != 0); } + bool operator==(const pstring_t &string) const noexcept { return (compare(string) == 0); } + bool operator!=(const pstring_t &string) const noexcept { return (compare(string) != 0); } - bool operator<(const pstring_t &string) const { return (compare(string) < 0); } - bool operator<=(const pstring_t &string) const { return (compare(string) <= 0); } - bool operator>(const pstring_t &string) const { return (compare(string) > 0); } - bool operator>=(const pstring_t &string) const { return (compare(string) >= 0); } + bool operator<(const pstring_t &string) const noexcept { return (compare(string) < 0); } + bool operator<=(const pstring_t &string) const noexcept { return (compare(string) <= 0); } + bool operator>(const pstring_t &string) const noexcept { return (compare(string) > 0); } + bool operator>=(const pstring_t &string) const noexcept { return (compare(string) >= 0); } friend auto operator<<(std::basic_ostream<typename string_type::value_type> &ostrm, const pstring_t &str) -> std::basic_ostream<typename string_type::value_type> & { @@ -211,7 +211,7 @@ public: // the following are extensions to <string> // FIXME: remove those - size_type mem_t_size() const { return m_str.size(); } + size_type mem_t_size() const noexcept { return m_str.size(); } private: string_type m_str; @@ -222,12 +222,12 @@ struct pu8_traits using mem_t = char; using code_t = char; using string_type = std::string; - static std::size_t len(const string_type &p) { return p.size(); } - static std::size_t codelen(const mem_t *p) { plib::unused_var(p); return 1; } - static std::size_t codelen(const code_t c) { plib::unused_var(c); return 1; } - static code_t code(const mem_t *p) { return *p; } + static std::size_t len(const string_type &p) noexcept { return p.size(); } + static std::size_t codelen(const mem_t *p) noexcept { plib::unused_var(p); return 1; } + static std::size_t codelen(const code_t c) noexcept { plib::unused_var(c); return 1; } + static code_t code(const mem_t *p) noexcept { return *p; } static void encode(const code_t c, string_type &s) { s += static_cast<mem_t>(c); } - static const mem_t *nthcode(const mem_t *p, const std::size_t n) { return &(p[n]); } + static const mem_t *nthcode(const mem_t *p, const std::size_t n) noexcept { return &(p[n]); } }; // No checking, this may deliver invalid codes @@ -236,7 +236,7 @@ struct putf8_traits using mem_t = char; using code_t = char32_t; using string_type = std::string; - static std::size_t len(const string_type &p) + static std::size_t len(const string_type &p) noexcept { std::size_t ret = 0; for (const auto &c : p) @@ -246,7 +246,7 @@ struct putf8_traits } return ret; } - static std::size_t codelen(const mem_t *p) + static std::size_t codelen(const mem_t *p) noexcept { const auto p1 = reinterpret_cast<const unsigned char *>(p); if ((*p1 & 0xE0) == 0xC0) @@ -262,7 +262,7 @@ struct putf8_traits return 1; } } - static std::size_t codelen(const code_t c) + static std::size_t codelen(const code_t c) noexcept { if (c < 0x0080) return 1; @@ -273,7 +273,7 @@ struct putf8_traits else // U+10000 U+1FFFFF return 4; // no checks } - static code_t code(const mem_t *p) + static code_t code(const mem_t *p) noexcept { const auto p1 = reinterpret_cast<const unsigned char *>(p); if ((*p1 & 0x80) == 0x00) @@ -312,7 +312,7 @@ struct putf8_traits s += static_cast<mem_t>(0x80 | (c & 0x3f)); } } - static const mem_t *nthcode(const mem_t *p, const std::size_t n) + static const mem_t *nthcode(const mem_t *p, const std::size_t n) noexcept { const mem_t *p1 = p; std::size_t i = n; @@ -327,7 +327,7 @@ struct putf16_traits using mem_t = char16_t; using code_t = char32_t; using string_type = std::u16string; - static std::size_t len(const string_type &p) + static std::size_t len(const string_type &p) noexcept { std::size_t ret = 0; auto i = p.begin(); @@ -340,19 +340,19 @@ struct putf16_traits } return ret; } - static std::size_t codelen(const mem_t *p) + static std::size_t codelen(const mem_t *p) noexcept { auto c = static_cast<uint16_t>(*p); return ((c & 0xd800) == 0xd800) ? 2 : 1; } - static std::size_t codelen(const code_t c) + static std::size_t codelen(const code_t c) noexcept { if (c < 0x10000) return 1; else // U+10000 U+1FFFFF return 2; } - static code_t code(const mem_t *p) + static code_t code(const mem_t *p) noexcept { auto c = static_cast<uint32_t>(*p++); if ((c & 0xd800) == 0xd800) @@ -362,7 +362,7 @@ struct putf16_traits } return static_cast<code_t>(c); } - static void encode(code_t c, string_type &s) + static void encode(code_t c, string_type &s) noexcept { auto cu = static_cast<uint32_t>(c); if (c > 0xffff) @@ -377,7 +377,7 @@ struct putf16_traits s += static_cast<mem_t>(cu); } } - static const mem_t *nthcode(const mem_t *p, const std::size_t n) + static const mem_t *nthcode(const mem_t *p, const std::size_t n) noexcept { std::size_t i = n; while (i-- > 0) @@ -391,7 +391,7 @@ struct pwchar_traits using mem_t = wchar_t; using code_t = char32_t; using string_type = std::wstring; - static std::size_t len(const string_type &p) + static std::size_t len(const string_type &p) noexcept { if (sizeof(wchar_t) == 2) { @@ -410,7 +410,7 @@ struct pwchar_traits return p.size(); } - static std::size_t codelen(const mem_t *p) + static std::size_t codelen(const mem_t *p) noexcept { if (sizeof(wchar_t) == 2) { @@ -421,7 +421,7 @@ struct pwchar_traits return 1; } - static std::size_t codelen(const code_t c) + static std::size_t codelen(const code_t c) noexcept { if (sizeof(wchar_t) == 2) return ((c & 0xd800) == 0xd800) ? 2 : 1; @@ -463,7 +463,7 @@ struct pwchar_traits else s += static_cast<wchar_t>(c); } - static const mem_t *nthcode(const mem_t *p, const std::size_t n) + static const mem_t *nthcode(const mem_t *p, const std::size_t n) noexcept { if (sizeof(wchar_t) == 2) { diff --git a/src/lib/netlist/plib/ptypes.h b/src/lib/netlist/plib/ptypes.h index d34651b9f70..7619faa1348 100644 --- a/src/lib/netlist/plib/ptypes.h +++ b/src/lib/netlist/plib/ptypes.h @@ -57,12 +57,12 @@ namespace plib struct nocopyassignmove { nocopyassignmove(const nocopyassignmove &) = delete; - nocopyassignmove(nocopyassignmove &&) = delete; + nocopyassignmove(nocopyassignmove &&) noexcept = delete; nocopyassignmove &operator=(const nocopyassignmove &) = delete; - nocopyassignmove &operator=(nocopyassignmove &&) = delete; + nocopyassignmove &operator=(nocopyassignmove &&) noexcept = delete; protected: nocopyassignmove() = default; - ~nocopyassignmove() = default; + ~nocopyassignmove() noexcept = default; }; struct nocopyassign @@ -71,9 +71,9 @@ namespace plib nocopyassign &operator=(const nocopyassign &) = delete; protected: nocopyassign() = default; - ~nocopyassign() = default; - nocopyassign(nocopyassign &&) = default; - nocopyassign &operator=(nocopyassign &&) = default; + ~nocopyassign() noexcept = default; + nocopyassign(nocopyassign &&) noexcept = default; + nocopyassign &operator=(nocopyassign &&) noexcept = default; }; //============================================================ |