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

	* include/ext/vstring.h (__versa_string::shrink_to_fit): Fix
	for -fno-exceptions.

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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ba2446c..a3c413b 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-02  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       * include/ext/vstring.h (__versa_string::shrink_to_fit): Fix
+       for -fno-exceptions.
+
 2010-02-02  Benjamin Kosnik  <bkoz@redhat.com>
 
        * include/bits/allocator.h: Fix for -fno-exceptions.

diff --git a/libstdc++-v3/include/ext/vstring.h b/libstdc++-v3/include/ext/vstring.h
index 0530777..1beecf6 100644 (file)
--- a/libstdc++-v3/include/ext/vstring.h
+++ b/libstdc++-v3/include/ext/vstring.h
@@ -461,9 +461,9 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
       void
       shrink_to_fit()
       {
-       try
+       __try
          { this->reserve(0); }
-       catch(...)
+       __catch(...)
          { }
       }
 #endif