From: Paolo Carlini Date: Mon, 21 Feb 2005 23:25:08 +0000 (+0000) Subject: basic_string.tcc (_Rep::_M_destroy): Don't check for this == &_S_empty_rep, it's... X-Git-Tag: releases/gcc-4.0.0~683 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=52a8962603028d05cf3dab25b04dc21bd7ffa23a;p=thirdparty%2Fgcc.git basic_string.tcc (_Rep::_M_destroy): Don't check for this == &_S_empty_rep, it's always false, here. 2005-02-21 Paolo Carlini * include/bits/basic_string.tcc (_Rep::_M_destroy): Don't check for this == &_S_empty_rep, it's always false, here. From-SVN: r95358 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 6625f2963289..12a0c5bb54cc 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2005-02-21 Paolo Carlini + + * 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 * 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 3bdce0f090ab..41db0dff4384 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(this), __size);