From: paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 3 Feb 2010 00:38:52 +0000 (+0000)
Subject: 2010-02-02  Paolo Carlini  <paolo.carlini@oracle.com>
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=74fd5bc4b54d024cb36dfa723ef18da42a1c2c9c;p=thirdparty%2Fgcc.git

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 ba2446ca842a..a3c413b65559 100644
--- 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 05307771e8f4..1beecf6ddcd7 100644
--- 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