From ba454dfbbec81fafed8f14b2fe59d895bd0255ac Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 7 Dec 2016 15:22:44 +0000 Subject: [PATCH] Use _GLIBCXX_THROW macro in bitmap_allocator * include/ext/bitmap_allocator.h (bitmap_allocator::_S_refill_pool) (bitmap_allocator::_M_allocate_single_object) (bitmap_allocator::_M_get): Use _GLIBCXX_THROW macro. From-SVN: r243352 --- libstdc++-v3/ChangeLog | 4 ++++ libstdc++-v3/include/ext/bitmap_allocator.h | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index c9cf692725d..53b4511cd35 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,9 @@ 2016-12-07 Jonathan Wakely + * include/ext/bitmap_allocator.h (bitmap_allocator::_S_refill_pool) + (bitmap_allocator::_M_allocate_single_object) + (bitmap_allocator::_M_get): Use _GLIBCXX_THROW macro. + * testsuite/18_support/bad_exception/59392.cc: Disable for C++17. * testsuite/18_support/headers/new/synopsis.cc: Add C++14 and C++17 diff --git a/libstdc++-v3/include/ext/bitmap_allocator.h b/libstdc++-v3/include/ext/bitmap_allocator.h index 836abc8c530..80ea64f3b71 100644 --- a/libstdc++-v3/include/ext/bitmap_allocator.h +++ b/libstdc++-v3/include/ext/bitmap_allocator.h @@ -648,7 +648,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * equal to that requested. */ size_t* - _M_get(size_t __sz) throw(std::bad_alloc); + _M_get(size_t __sz) _GLIBCXX_THROW(std::bad_alloc); /** @brief This function just clears the internal Free List, and * gives back all the memory to the OS. @@ -766,7 +766,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * the newly acquired block. Having a tight bound. */ void - _S_refill_pool() throw(std::bad_alloc) + _S_refill_pool() _GLIBCXX_THROW(std::bad_alloc) { #if defined _GLIBCXX_DEBUG _S_check_for_free_blocks(); @@ -824,7 +824,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * Amortized Constant time. */ pointer - _M_allocate_single_object() throw(std::bad_alloc) + _M_allocate_single_object() _GLIBCXX_THROW(std::bad_alloc) { #if defined __GTHREADS __scoped_lock __bit_lock(_S_mut); -- 2.30.2