2009-09-28 Benjamin Kosnik <bkoz@redhat.com>

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / libsupc++ / vec.cc

diff --git a/libstdc++-v3/libsupc++/vec.cc b/libstdc++-v3/libsupc++/vec.cc
index e44a023..286401c 100644 (file)
--- a/libstdc++-v3/libsupc++/vec.cc
+++ b/libstdc++-v3/libsupc++/vec.cc
@@ -95,12 +95,12 @@ namespace __cxxabiv1
        reinterpret_cast <std::size_t *> (base)[-2] = element_size;
 #endif
       }
-    try
+    __try
       {
        __cxa_vec_ctor(base, element_count, element_size,
                       constructor, destructor);
       }
-    catch (...)
+    __catch(...)
       {
        {
          uncatch_exception ue;
@@ -136,12 +136,12 @@ namespace __cxxabiv1
        reinterpret_cast <std::size_t *> (base)[-2] = element_size;
 #endif
       }
-    try
+    __try
       {
        __cxa_vec_ctor(base, element_count, element_size,
                       constructor, destructor);
       }
-    catch (...)
+    __catch(...)
       {
        {
          uncatch_exception ue;
@@ -164,13 +164,13 @@ namespace __cxxabiv1
     std::size_t ix = 0;
     char *ptr = static_cast<char *>(array_address);
     
-    try
+    __try
       {
        if (constructor)
          for (; ix != element_count; ix++, ptr += element_size)
            constructor(ptr);
       }
-    catch (...)
+    __catch(...)
       {
        {
          uncatch_exception ue;
@@ -194,14 +194,14 @@ namespace __cxxabiv1
     char *dest_ptr = static_cast<char *>(dest_array);
     char *src_ptr = static_cast<char *>(src_array);
     
-    try
+    __try
       {
        if (constructor)
          for (; ix != element_count; 
               ix++, src_ptr += element_size, dest_ptr += element_size)
            constructor(dest_ptr, src_ptr);
       }
-    catch (...)
+    __catch(...)
       {
        {
          uncatch_exception ue;
@@ -226,7 +226,7 @@ namespace __cxxabiv1
 
        ptr += element_count * element_size;
 
-       try
+       __try
          {
            while (ix--)
              {
@@ -234,7 +234,7 @@ namespace __cxxabiv1
                destructor(ptr);
              }
          }
-       catch (...)
+       __catch(...)
          {
            {
              uncatch_exception ue;
@@ -261,7 +261,7 @@ namespace __cxxabiv1
 
        ptr += element_count * element_size;
 
-       try
+       __try
          {
            while (ix--)
              {
@@ -269,7 +269,7 @@ namespace __cxxabiv1
                destructor(ptr);
              }
          }
-       catch (...)
+       __catch(...)
          {
            std::terminate();
          }
@@ -304,12 +304,12 @@ namespace __cxxabiv1
       {
        std::size_t element_count = reinterpret_cast<std::size_t *>(base)[-1];
        base -= padding_size;
-       try
+       __try
          {
            __cxa_vec_dtor(array_address, element_count, element_size,
                           destructor);
          }
-       catch (...)
+       __catch(...)
          {
            {
              uncatch_exception ue;
@@ -339,12 +339,12 @@ namespace __cxxabiv1
        std::size_t element_count = reinterpret_cast<std::size_t *> (base)[-1];
        base -= padding_size;
        size = element_count * element_size + padding_size;
-       try
+       __try
          {
            __cxa_vec_dtor(array_address, element_count, element_size,
                           destructor);
          }
-       catch (...)
+       __catch(...)
          {
            {
              uncatch_exception ue;