From 8443c250af760dbb4489b3ff9e75bc334feba4df Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Fri, 4 Aug 2006 09:34:17 +0000 Subject: [PATCH] stl_queue.h (priority_queue<>::push, [...]): Remove try/catch, just follow the letter of the Standard. 2006-08-04 Paolo Carlini * include/bits/stl_queue.h (priority_queue<>::push, priority_queue<>::pop): Remove try/catch, just follow the letter of the Standard. From-SVN: r115923 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/include/bits/stl_queue.h | 24 ++++-------------------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 5424e5717e49..4958cf77ecf8 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2006-08-04 Paolo Carlini + + * include/bits/stl_queue.h (priority_queue<>::push, + priority_queue<>::pop): Remove try/catch, just follow the + letter of the Standard. + 2006-08-03 Paolo Carlini * include/bits/stl_queue.h: Trivial formatting fixes. diff --git a/libstdc++-v3/include/bits/stl_queue.h b/libstdc++-v3/include/bits/stl_queue.h index e2cd0d5d2087..84c003540ed4 100644 --- a/libstdc++-v3/include/bits/stl_queue.h +++ b/libstdc++-v3/include/bits/stl_queue.h @@ -424,16 +424,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) void push(const value_type& __x) { - try - { - c.push_back(__x); - std::push_heap(c.begin(), c.end(), comp); - } - catch(...) - { - c.clear(); - __throw_exception_again; - } + c.push_back(__x); + std::push_heap(c.begin(), c.end(), comp); } /** @@ -451,16 +443,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) pop() { __glibcxx_requires_nonempty(); - try - { - std::pop_heap(c.begin(), c.end(), comp); - c.pop_back(); - } - catch(...) - { - c.clear(); - __throw_exception_again; - } + std::pop_heap(c.begin(), c.end(), comp); + c.pop_back(); } };