Skip to content

Commit

Permalink
Merge #2376: Replace deprecated throw() with noexcept specifier (C++11)
Browse files Browse the repository at this point in the history
24ce9a7 Use the noexcept specifier (C++11) instead of deprecated throw() (practicalswift)

Pull request description:

  Straightforward cherry-pick from bitcoin#10965

ACKs for top commit:
  furszy:
    utACK 24ce9a7
  Fuzzbawls:
    utACK 24ce9a7

Tree-SHA512: c14aea9d9c39d99250ef825e4066851ef50700e8b91f4320b278661b97e1da616cf8464d4660bf0043e2fd163be81d3b9302057b4ea4b1096eb75402bd17b49c
  • Loading branch information
random-zebra committed May 11, 2021
2 parents eeb1632 + 24ce9a7 commit 44ddf8a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions src/support/allocators/secure.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ struct secure_allocator : public std::allocator<T> {
typedef typename base::reference reference;
typedef typename base::const_reference const_reference;
typedef typename base::value_type value_type;
secure_allocator() throw() {}
secure_allocator(const secure_allocator& a) throw() : base(a) {}
secure_allocator() noexcept {}
secure_allocator(const secure_allocator& a) noexcept : base(a) {}
template <typename U>
secure_allocator(const secure_allocator<U>& a) throw() : base(a)
secure_allocator(const secure_allocator<U>& a) noexcept : base(a)
{
}
~secure_allocator() throw() {}
~secure_allocator() noexcept {}
template <typename _Other>
struct rebind {
typedef secure_allocator<_Other> other;
Expand Down
8 changes: 4 additions & 4 deletions src/support/allocators/zeroafterfree.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ struct zero_after_free_allocator : public std::allocator<T> {
typedef typename base::reference reference;
typedef typename base::const_reference const_reference;
typedef typename base::value_type value_type;
zero_after_free_allocator() throw() {}
zero_after_free_allocator(const zero_after_free_allocator& a) throw() : base(a) {}
zero_after_free_allocator() noexcept {}
zero_after_free_allocator(const zero_after_free_allocator& a) noexcept : base(a) {}
template <typename U>
zero_after_free_allocator(const zero_after_free_allocator<U>& a) throw() : base(a)
zero_after_free_allocator(const zero_after_free_allocator<U>& a) noexcept : base(a)
{
}
~zero_after_free_allocator() throw() {}
~zero_after_free_allocator() noexcept {}
template <typename _Other>
struct rebind {
typedef zero_after_free_allocator<_Other> other;
Expand Down

0 comments on commit 44ddf8a

Please sign in to comment.