Commit 036c0f63 by Benjamin Kosnik Committed by Benjamin Kosnik

allocator.h: Fix for -fno-exceptions.

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.

From-SVN: r156459
parent 8ddbc857
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> 2010-02-02 Paolo Carlini <paolo.carlini@oracle.com>
* testsuite/30_threads/unique_future: Rename to /future. * testsuite/30_threads/unique_future: Rename to /future.
......
...@@ -194,9 +194,9 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -194,9 +194,9 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
static void static void
_S_do_it(_Tp& __v) _S_do_it(_Tp& __v)
{ {
try __try
{ _Tp(__v).swap(__v); } { _Tp(__v).swap(__v); }
catch(...) { } __catch(...) { }
} }
}; };
#endif #endif
......
...@@ -743,9 +743,9 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -743,9 +743,9 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
void void
shrink_to_fit() shrink_to_fit()
{ {
try __try
{ reserve(0); } { reserve(0); }
catch(...) __catch(...)
{ } { }
} }
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment