diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2010-02-03 00:20:05 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2010-02-03 00:20:05 +0000 |
| commit | 036c0f63e1db4c94cd41970e6d54489f0d79df71 (patch) | |
| tree | 9b2aadc307bd313a115d6bcd61223054b4f2edc5 | |
| parent | 8ddbc857a71854c6bf1fb191d45620c673df9493 (diff) | |
| download | gcc-036c0f63e1db4c94cd41970e6d54489f0d79df71.zip gcc-036c0f63e1db4c94cd41970e6d54489f0d79df71.tar.gz gcc-036c0f63e1db4c94cd41970e6d54489f0d79df71.tar.bz2 | |
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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/allocator.h | 4 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/basic_string.h | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 1d09a1a..ba2446c 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -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. diff --git a/libstdc++-v3/include/bits/allocator.h b/libstdc++-v3/include/bits/allocator.h index 283224d..4522051 100644 --- a/libstdc++-v3/include/bits/allocator.h +++ b/libstdc++-v3/include/bits/allocator.h @@ -194,9 +194,9 @@ _GLIBCXX_BEGIN_NAMESPACE(std) static void _S_do_it(_Tp& __v) { - try + __try { _Tp(__v).swap(__v); } - catch(...) { } + __catch(...) { } } }; #endif diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h index a549cf7..0b166f3 100644 --- a/libstdc++-v3/include/bits/basic_string.h +++ b/libstdc++-v3/include/bits/basic_string.h @@ -743,9 +743,9 @@ _GLIBCXX_BEGIN_NAMESPACE(std) void shrink_to_fit() { - try + __try { reserve(0); } - catch(...) + __catch(...) { } } #endif |