aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Carlini <paolo.carlini@oracle.com>2010-02-03 00:38:52 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2010-02-03 00:38:52 +0000
commit23f8e984b7983df4b06836a0662174c0331162ae (patch)
tree611f41872aaffb912b54a51b752a9ef633ea6ed4
parent036c0f63e1db4c94cd41970e6d54489f0d79df71 (diff)
downloadgcc-23f8e984b7983df4b06836a0662174c0331162ae.zip
gcc-23f8e984b7983df4b06836a0662174c0331162ae.tar.gz
gcc-23f8e984b7983df4b06836a0662174c0331162ae.tar.bz2
vstring.h (__versa_string::shrink_to_fit): Fix for -fno-exceptions.
2010-02-02 Paolo Carlini <paolo.carlini@oracle.com> * include/ext/vstring.h (__versa_string::shrink_to_fit): Fix for -fno-exceptions. From-SVN: r156460
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/include/ext/vstring.h4
2 files changed, 7 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ba2446c..a3c413b 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 0530777..1beecf6 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