diff options
| author | hubicka <hubicka@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-04-24 09:35:19 +0000 |
|---|---|---|
| committer | hubicka <hubicka@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-04-24 09:35:19 +0000 |
| commit | 463a39f5ca6152b3a5f722f6c390eb53cffc8ca4 (patch) | |
| tree | ca7fdfbd6a54e70c271f298827f42551d7baa40a /libstdc++-v3/include/bits/basic_string.tcc | |
| parent | abbe4d48527cb8434209c1d1005a3aed61a07076 (diff) | |
| download | gcc-463a39f5ca6152b3a5f722f6c390eb53cffc8ca4.tar.gz | |
* include/tr1_impl/array (at): Do not use builtin_expect.
* include/ext/throw_allocator.h (allocate): Likewise.
* include/ext/pool_allocator.h (allocate): Likweise.
* include/ext/bitmap_allocator.h (allocate): Likewise.
* include/ext/rc_string_base.h (_S_construct): Likewise.
* include/ext/malloc_allocator.h (allocate): Likewise.
* include/ext/mt_allocator.h (allocate): Likewise.
* include/ext/sso_string_base.h (_M_construct): Likewise.
* include/bits/basic_string.tcc (_S_construct): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@146681 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/bits/basic_string.tcc')
| -rw-r--r-- | libstdc++-v3/include/bits/basic_string.tcc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libstdc++-v3/include/bits/basic_string.tcc b/libstdc++-v3/include/bits/basic_string.tcc index a5553c61a1b..ec771c66859 100644 --- a/libstdc++-v3/include/bits/basic_string.tcc +++ b/libstdc++-v3/include/bits/basic_string.tcc @@ -129,8 +129,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) return _S_empty_rep()._M_refdata(); #endif // NB: Not required, but considered best practice. - if (__builtin_expect(__gnu_cxx::__is_null_pointer(__beg) - && __beg != __end, 0)) + if (__gnu_cxx::__is_null_pointer(__beg) && __beg != __end) __throw_logic_error(__N("basic_string::_S_construct NULL not valid")); const size_type __dnew = static_cast<size_type>(std::distance(__beg, |