diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2017-08-16 02:29:09 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2017-08-16 02:29:18 +0200 |
| commit | 655970d9c60ae6850daf452457e14e21047c0e1b (patch) | |
| tree | 2e5df8c136a05d5980ec9fc7da695f6c35ecb18b /src/support | |
| parent | b6a48914c50631914192aa11b19205436a9c664d (diff) | |
| parent | 98625502607dd9180ab6840b832dc89986d0b150 (diff) | |
| download | bitcoin-655970d9c60ae6850daf452457e14e21047c0e1b.tar.xz | |
Merge #10965: Replace deprecated throw() with noexcept specifier (C++11)
986255026 Use the noexcept specifier (C++11) instead of deprecated throw() (practicalswift)
Pull request description:
Use the `noexcept` specifier (C++11) instead of deprecated `throw()`.
Tree-SHA512: cf9b6b18f61f2f59bbeceb2e43b5cd07a60f5e569c8def05c410cb72326d597c80cb731059969ef89fa5fddaae1242225886e6109fcb535c4ad62d56ebcdf1ea
Diffstat (limited to 'src/support')
| -rw-r--r-- | src/support/allocators/secure.h | 8 | ||||
| -rw-r--r-- | src/support/allocators/zeroafterfree.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/support/allocators/secure.h b/src/support/allocators/secure.h index f20f424941..39347c73bb 100644 --- a/src/support/allocators/secure.h +++ b/src/support/allocators/secure.h @@ -26,13 +26,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; diff --git a/src/support/allocators/zeroafterfree.h b/src/support/allocators/zeroafterfree.h index 581d5d6318..618874ceee 100644 --- a/src/support/allocators/zeroafterfree.h +++ b/src/support/allocators/zeroafterfree.h @@ -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; |