OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Benjamin Kosnik 2010-02-03 00:20:05 +00:00 committed by Benjamin Kosnik
parent 8ddbc857a7
commit 036c0f63e1
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libstdc++-v3/ChangeLog
View File

@ -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.

4
libstdc++-v3/include/bits/allocator.h
View File

@ -194,9 +194,9 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
static void
_S_do_it(_Tp& __v)
{
try
__try
{ _Tp(__v).swap(__v); }
catch(...) { }
__catch(...) { }
}
};
#endif

4
libstdc++-v3/include/bits/basic_string.h
View File

@ -743,9 +743,9 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
void
shrink_to_fit()
{
try
__try
{ reserve(0); }
catch(...)
__catch(...)
{ }
}
#endif