2010-02-02 Benjamin Kosnik <bkoz@redhat.com>

	* include/bits/allocator.h: Fix for -fno-exceptions.
	* include/bits/basic_string.h (basic_string::shrink_to_fit): Same.

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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 1d09a1a..ba2446c 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-02  Benjamin Kosnik  <bkoz@redhat.com>
+
+       * include/bits/allocator.h: Fix for -fno-exceptions.
+       * include/bits/basic_string.h (basic_string::shrink_to_fit): Same.
+
 2010-02-02  Paolo Carlini  <paolo.carlini@oracle.com>
 
        * testsuite/30_threads/unique_future: Rename to /future.

diff --git a/libstdc++-v3/include/bits/allocator.h b/libstdc++-v3/include/bits/allocator.h
index 283224d..4522051 100644 (file)
--- a/libstdc++-v3/include/bits/allocator.h
+++ b/libstdc++-v3/include/bits/allocator.h
@@ -194,9 +194,9 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
        static void
        _S_do_it(_Tp& __v)
        {
-        try
+        __try
           { _Tp(__v).swap(__v); }
-        catch(...) { }
+        __catch(...) { }
        }
      };
 #endif

diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h
index a549cf7..0b166f3 100644 (file)
--- a/libstdc++-v3/include/bits/basic_string.h
+++ b/libstdc++-v3/include/bits/basic_string.h
@@ -743,9 +743,9 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       void
       shrink_to_fit()
       {
-       try
+       __try
          { reserve(0); }
-       catch(...)
+       __catch(...)
          { }
       }
 #endif