diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2009-11-19 19:21:05 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2009-11-19 19:21:05 +0000 |
| commit | bf4967a1bd8c61fdf111a47f6ef87e24479299df (patch) | |
| tree | 435b893a5dde8febb1e697f4de0cbf80a78cbaeb /libstdc++-v3/src | |
| parent | fdabb520f28764ae547c236234f60b7622a6d02a (diff) | |
| download | gcc-bf4967a1bd8c61fdf111a47f6ef87e24479299df.zip gcc-bf4967a1bd8c61fdf111a47f6ef87e24479299df.tar.gz gcc-bf4967a1bd8c61fdf111a47f6ef87e24479299df.tar.bz2 | |
pool_allocator.cc: Adjust catch blocks.
2009-11-19 Benjamin Kosnik <bkoz@redhat.com>
* src/pool_allocator.cc: Adjust catch blocks.
* src/bitmap_allocator.cc: Same.
* src/localename.cc: Same.
* src/ios.cc: Same.
* libsupc++/cxxabi-forced.h: Adjust comments, markup.
* testsuite/util/testsuite_hooks.h (copy_constructor::copyCount):
Remove.
(copy_constructor::dtorCount): Remove.
* testsuite/23_containers/list/modifiers/1.h: Adjust.
* testsuite/23_containers/list/modifiers/2.h: Same.
* testsuite/23_containers/list/modifiers/3.h: Same.
From-SVN: r154341
Diffstat (limited to 'libstdc++-v3/src')
| -rw-r--r-- | libstdc++-v3/src/bitmap_allocator.cc | 2 | ||||
| -rw-r--r-- | libstdc++-v3/src/ios.cc | 4 | ||||
| -rw-r--r-- | libstdc++-v3/src/localename.cc | 2 | ||||
| -rw-r--r-- | libstdc++-v3/src/pool_allocator.cc | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/libstdc++-v3/src/bitmap_allocator.cc b/libstdc++-v3/src/bitmap_allocator.cc index 686a5ef..55b308d 100644 --- a/libstdc++-v3/src/bitmap_allocator.cc +++ b/libstdc++-v3/src/bitmap_allocator.cc @@ -76,7 +76,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) __ret = reinterpret_cast<size_t*> (::operator new(__sz + sizeof(size_t))); } - __catch(...) + __catch(const std::bad_alloc&) { this->_M_clear(); } diff --git a/libstdc++-v3/src/ios.cc b/libstdc++-v3/src/ios.cc index 25184d0..9d2ff8e 100644 --- a/libstdc++-v3/src/ios.cc +++ b/libstdc++-v3/src/ios.cc @@ -123,12 +123,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std) __newsize = __ix + 1; __try { __words = new _Words[__newsize]; } - __catch(...) + __catch(const std::bad_alloc&) { _M_streambuf_state |= badbit; if (_M_streambuf_state & _M_exception) __throw_ios_failure(__N("ios_base::_M_grow_words " - "allocation failed")); + "allocation failed")); if (__iword) _M_word_zero._M_iword = 0; else diff --git a/libstdc++-v3/src/localename.cc b/libstdc++-v3/src/localename.cc index 98f6020..5ee8258 100644 --- a/libstdc++-v3/src/localename.cc +++ b/libstdc++-v3/src/localename.cc @@ -163,7 +163,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) __try { _M_impl->_M_replace_categories(__add._M_impl, __cat); } - __catch (...) + __catch(...) { _M_impl->_M_remove_reference(); __throw_exception_again; diff --git a/libstdc++-v3/src/pool_allocator.cc b/libstdc++-v3/src/pool_allocator.cc index ebaa394..80f07ba 100644 --- a/libstdc++-v3/src/pool_allocator.cc +++ b/libstdc++-v3/src/pool_allocator.cc @@ -94,7 +94,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) { _S_start_free = static_cast<char*>(::operator new(__bytes_to_get)); } - __catch (...) + __catch(const std::bad_alloc&) { // Try to make do with what we have. That can't hurt. We // do not try smaller requests, since that tends to result |