diff options
| author | Paolo Carlini <pcarlini@suse.de> | 2005-02-21 23:25:08 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2005-02-21 23:25:08 +0000 |
| commit | 52a8962603028d05cf3dab25b04dc21bd7ffa23a (patch) | |
| tree | ad43fcd168c3d158400f8d7fcbf51302226a1bf0 | |
| parent | 84bafc8d191e31d205d9c33cd0dc91cf9910cab3 (diff) | |
| download | gcc-52a8962603028d05cf3dab25b04dc21bd7ffa23a.zip gcc-52a8962603028d05cf3dab25b04dc21bd7ffa23a.tar.gz gcc-52a8962603028d05cf3dab25b04dc21bd7ffa23a.tar.bz2 | |
basic_string.tcc (_Rep::_M_destroy): Don't check for this == &_S_empty_rep, it's always false, here.
2005-02-21 Paolo Carlini <pcarlini@suse.de>
* include/bits/basic_string.tcc (_Rep::_M_destroy): Don't
check for this == &_S_empty_rep, it's always false, here.
From-SVN: r95358
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/basic_string.tcc | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 6625f29..12a0c5b 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2005-02-21 Paolo Carlini <pcarlini@suse.de> + + * include/bits/basic_string.tcc (_Rep::_M_destroy): Don't + check for this == &_S_empty_rep, it's always false, here. + 2005-02-19 Matt Austern <austern@gmail.com> * include/tr1/functional (tr1_hashtable_define_trivial_hash): Make diff --git a/libstdc++-v3/include/bits/basic_string.tcc b/libstdc++-v3/include/bits/basic_string.tcc index 3bdce0f..41db0dff 100644 --- a/libstdc++-v3/include/bits/basic_string.tcc +++ b/libstdc++-v3/include/bits/basic_string.tcc @@ -1,6 +1,6 @@ // Components for manipulating sequences of characters -*- C++ -*- -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -425,10 +425,6 @@ namespace std basic_string<_CharT, _Traits, _Alloc>::_Rep:: _M_destroy(const _Alloc& __a) throw () { -#ifndef _GLIBCXX_FULLY_DYNAMIC_STRING - if (this == &_S_empty_rep()) - return; -#endif const size_type __size = sizeof(_Rep_base) + (this->_M_capacity + 1) * sizeof(_CharT); _Raw_bytes_alloc(__a).deallocate(reinterpret_cast<char*>(this), __size); |