diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2020-08-10 12:02:18 +0100 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2020-08-10 12:02:18 +0100 |
| commit | 8bd92d8097d44be01a2bc7e14f7916d151dffcd6 (patch) | |
| tree | b36dac1d91ab5eab03d6b047fada6c7b88b88439 | |
| parent | 7b7bbbcf510bbc0d95389d157369ade799af4717 (diff) | |
| download | gcc-8bd92d8097d44be01a2bc7e14f7916d151dffcd6.zip gcc-8bd92d8097d44be01a2bc7e14f7916d151dffcd6.tar.gz gcc-8bd92d8097d44be01a2bc7e14f7916d151dffcd6.tar.bz2 | |
libstdc++: Check __cpp_exceptions in basic_string::reserve()
If exceptions are disabled then reallocating could abort, so ignore
shrink-to-fit requests.
libstdc++-v3/ChangeLog:
* include/bits/basic_string.tcc [_GLIBCXX_USE_CXX11_ABI=0]
(basic_string::reserve()): Do nothing if exceptions are not
enabled.
| -rw-r--r-- | libstdc++-v3/include/bits/basic_string.tcc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libstdc++-v3/include/bits/basic_string.tcc b/libstdc++-v3/include/bits/basic_string.tcc index a64b63a..95d2fdb 100644 --- a/libstdc++-v3/include/bits/basic_string.tcc +++ b/libstdc++-v3/include/bits/basic_string.tcc @@ -1179,6 +1179,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION basic_string<_CharT, _Traits, _Alloc>:: reserve() { +#if __cpp_exceptions if (length() < capacity() || _M_rep()->_M_is_shared()) try { @@ -1191,6 +1192,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { throw; } catch (...) { /* swallow the exception */ } +#endif } template<typename _CharT, typename _Traits, typename _Alloc> |