2009-02-03 Paolo Carlini <paolo.carlini@oracle.com>

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / include / ext / pb_ds / detail / bin_search_tree_ / constructors_destructor_fn_imps.hpp

diff --git a/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/constructors_destructor_fn_imps.hpp b/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/constructors_destructor_fn_imps.hpp
index 295a57a..617843b 100644 (file)
--- a/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/constructors_destructor_fn_imps.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/constructors_destructor_fn_imps.hpp
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 
-// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the terms
@@ -95,7 +95,7 @@ PB_DS_CLASS_NAME(const PB_DS_CLASS_C_DEC& other) :
   m_size = other.m_size;
   _GLIBCXX_DEBUG_ONLY(other.structure_only_assert_valid();)
 
-    try
+    __try
       {
         m_p_head->m_p_parent = recursive_copy_node(other.m_p_head->m_p_parent);
         if (m_p_head->m_p_parent != NULL)
@@ -103,7 +103,7 @@ PB_DS_CLASS_NAME(const PB_DS_CLASS_C_DEC& other) :
         m_size = other.m_size;
         initialize_min_max();
       }
-    catch(...)
+    __catch(...)
       {
         _GLIBCXX_DEBUG_ONLY(debug_base::clear();)
        s_node_allocator.deallocate(m_p_head, 1);
@@ -163,11 +163,11 @@ recursive_copy_node(const node_pointer p_nd)
     return (NULL);
 
   node_pointer p_ret = s_node_allocator.allocate(1);
-  try
+  __try
     {
       new (p_ret) node(*p_nd);
     }
-  catch(...)
+  __catch(...)
     {
       s_node_allocator.deallocate(p_ret, 1);
       __throw_exception_again;
@@ -175,12 +175,12 @@ recursive_copy_node(const node_pointer p_nd)
 
   p_ret->m_p_left = p_ret->m_p_right = NULL;
 
-  try
+  __try
     {
       p_ret->m_p_left = recursive_copy_node(p_nd->m_p_left);
       p_ret->m_p_right = recursive_copy_node(p_nd->m_p_right);
     }
-  catch(...)
+  __catch(...)
     {
       clear_imp(p_ret);
       __throw_exception_again;