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

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
This commit is contained in:
Paolo Carlini 2005-02-21 23:25:08 +00:00 committed by Paolo Carlini
parent 84bafc8d19
commit 52a8962603
2 changed files with 6 additions and 5 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 @@
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

6
libstdc++-v3/include/bits/basic_string.tcc
View File

@ -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);