diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-02-08 13:35:20 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-08 13:35:20 +0100 |
commit | cdd1430c6eb50ef5fbe4e65881dbee936fb0a075 (patch) | |
tree | 0c65dbfdd53620d62629a2115a2f6e8bb4f9d753 | |
parent | cc1637f6c8451cc9bd47e2d8965db28a00848fb2 (diff) | |
parent | 0c9e40e402af05365895d315b0b90879dc5a3168 (diff) |
Merge pull request #25946 from vespa-engine/toregge/stop-using-throw-as-noexcept-specifier
Stop using throw() as noexcept specifier.
-rw-r--r-- | fsa/src/libfsa/automaton-alternate.h | 10 | ||||
-rw-r--r-- | logd/src/logd/exceptions.h | 2 | ||||
-rw-r--r-- | vespalib/src/tests/stllike/uniq_by_sort_map_hash.cpp | 4 | ||||
-rw-r--r-- | vespalog/src/logger/llreader.h | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/fsa/src/libfsa/automaton-alternate.h b/fsa/src/libfsa/automaton-alternate.h index db17306376b..16312e366fe 100644 --- a/fsa/src/libfsa/automaton-alternate.h +++ b/fsa/src/libfsa/automaton-alternate.h @@ -436,14 +436,14 @@ private: struct rebind { using other = MMapArenaAllocator<_Tp1>; }; - MMapArenaAllocator() throw(): _chunks(), _size(0) { } + MMapArenaAllocator() noexcept : _chunks(), _size(0) { } - MMapArenaAllocator(const MMapArenaAllocator&) throw(): _chunks(), _size(0) { } + MMapArenaAllocator(const MMapArenaAllocator&) noexcept : _chunks(), _size(0) { } template<typename _Tp1> - MMapArenaAllocator(const MMapArenaAllocator<_Tp1>&) throw(): _chunks(), _size(0) { } + MMapArenaAllocator(const MMapArenaAllocator<_Tp1>&) noexcept : _chunks(), _size(0) { } - ~MMapArenaAllocator() throw() { release(); } + ~MMapArenaAllocator() noexcept { release(); } pointer address(reference __x) const { return &__x; } @@ -489,7 +489,7 @@ private: } size_type - max_size() const throw() + max_size() const noexcept { return _CAPACITY / sizeof(_Tp); } void diff --git a/logd/src/logd/exceptions.h b/logd/src/logd/exceptions.h index f2242764060..acee03dcda5 100644 --- a/logd/src/logd/exceptions.h +++ b/logd/src/logd/exceptions.h @@ -12,7 +12,7 @@ private: public: MsgException(const std::string & s) : _string(s) {} ~MsgException() override {} - const char *what() const throw() override { return _string.c_str(); } + const char *what() const noexcept override { return _string.c_str(); } }; class ConnectionException : public MsgException diff --git a/vespalib/src/tests/stllike/uniq_by_sort_map_hash.cpp b/vespalib/src/tests/stllike/uniq_by_sort_map_hash.cpp index 77da1693317..27442cab6ca 100644 --- a/vespalib/src/tests/stllike/uniq_by_sort_map_hash.cpp +++ b/vespalib/src/tests/stllike/uniq_by_sort_map_hash.cpp @@ -28,7 +28,7 @@ public: }; RoundRobinAllocator() { } template<typename _Tp1> - RoundRobinAllocator(const RoundRobinAllocator<_Tp1>&) throw() { } + RoundRobinAllocator(const RoundRobinAllocator<_Tp1>&) noexcept { } void construct(pointer p, const T& val) { new(static_cast<void*>(p)) T(val); } void destroy(pointer p) { @@ -49,7 +49,7 @@ public: _r += n; } } - size_type max_size() const throw() { return _sz; } + size_type max_size() const noexcept { return _sz; } private: static size_t _r; diff --git a/vespalog/src/logger/llreader.h b/vespalog/src/logger/llreader.h index 1fadf2c6ae0..26d3bf3e4a5 100644 --- a/vespalog/src/logger/llreader.h +++ b/vespalog/src/logger/llreader.h @@ -12,8 +12,8 @@ private: public: MsgException(const MsgException &x) : std::exception(), _string(x._string) {} MsgException(const char *s) : _string(s) {} - ~MsgException() throw() {} // nothing to do - const char *what() const throw() override { return _string; } + ~MsgException() override = default; + const char *what() const noexcept override { return _string; } }; class InputBuf |