2005-08-25 Paolo Carlini <pcarlini@suse.de>

	* include/tr1/hashtable: Use __throw_exception_again,
	not naked throw, in the catch clauses.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@103483 138bc75d-0d04-0410-961f-82ee72b054a4

2 files changed, 11 insertions, 5 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 5145d6f9305..83ec79377d3 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 4245e975d54..af43da2814f 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;
 	}
     }