aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Carlini <pcarlini@suse.de>2005-08-25 09:34:49 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2005-08-25 09:34:49 +0000
commit40f15089964c9fc63d84293ca2f30e7437e0bc5b (patch)
tree53bccdc0d867b2531d1bfdbea5756f2e1d76c005
parent5ebbc0ee56fe91238d4e75188983e866a8e37263 (diff)
downloadgcc-40f15089964c9fc63d84293ca2f30e7437e0bc5b.zip
gcc-40f15089964c9fc63d84293ca2f30e7437e0bc5b.tar.gz
gcc-40f15089964c9fc63d84293ca2f30e7437e0bc5b.tar.bz2
hashtable: Use __throw_exception_again, not naked throw, in the catch clauses.
2005-08-25 Paolo Carlini <pcarlini@suse.de> * include/tr1/hashtable: Use __throw_exception_again, not naked throw, in the catch clauses. From-SVN: r103483
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/include/tr1/hashtable11
2 files changed, 11 insertions, 5 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 5145d6f..83ec793 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-25 Paolo Carlini <pcarlini@suse.de>
+
+ * include/tr1/hashtable: Use __throw_exception_again,
+ not naked throw, in the catch clauses.
+
2005-08-24 Lawrence Lim <llim@redhat.com>
Jakub Jelinek <jakub@redhat.com>
Benjamin Kosnik <bkoz@redhat.com>
diff --git a/libstdc++-v3/include/tr1/hashtable b/libstdc++-v3/include/tr1/hashtable
index 4245e97..af43da2 100644
--- a/libstdc++-v3/include/tr1/hashtable
+++ b/libstdc++-v3/include/tr1/hashtable
@@ -59,6 +59,7 @@
#include <cstddef>
#include <cstdlib>
#include <cmath>
+#include <bits/functexcept.h>
#include <tr1/type_traits> // For true_type and false_type
//----------------------------------------------------------------------
@@ -1122,7 +1123,7 @@ namespace tr1
catch(...)
{
m_node_allocator.deallocate(n, 1);
- throw;
+ __throw_exception_again;
}
}
@@ -1244,7 +1245,7 @@ namespace tr1
{
clear();
m_deallocate_buckets(m_buckets, m_bucket_count);
- throw;
+ __throw_exception_again;
}
}
@@ -1282,7 +1283,7 @@ namespace tr1
{
clear();
m_deallocate_buckets (m_buckets, m_bucket_count);
- throw;
+ __throw_exception_again;
}
}
@@ -1513,7 +1514,7 @@ namespace tr1
catch (...)
{
m_deallocate_node (new_node);
- throw;
+ __throw_exception_again;
}
}
@@ -1691,7 +1692,7 @@ namespace tr1
m_deallocate_buckets(new_array, N);
m_deallocate_nodes(m_buckets, m_bucket_count);
m_element_count = 0;
- throw;
+ __throw_exception_again;
}
}