git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

list (splice): Remove splice_alloc check, redundant after implementing the splice bits of N1599. 

2006-02-22  Paolo Carlini  <pcarlini@suse.de>

	* include/debug/list (splice): Remove splice_alloc check, redundant
	after implementing the splice bits of N1599.

From-SVN: r111361
This commit is contained in:
Paolo Carlini 2006-02-22 10:20:09 +00:00 committed by Paolo Carlini
parent 6217ebd277
commit afde1de353
2 changed files with 13 additions and 7 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 @@
2006-02-22 Paolo Carlini <pcarlini@suse.de>
* include/debug/list (splice): Remove splice_alloc check, redundant
after implementing the splice bits of N1599.
2006-02-21 Benjamin Kosnik <bkoz@redhat.com>
* include/c_std/cmath.tcc: Use _GLIBCXX_BEGIN_NAMESPACE,

15
libstdc++-v3/include/debug/list
View File

@ -1,6 +1,6 @@
// Debugging list implementation -*- C++ -*-
// Copyright (C) 2003, 2004, 2005
// Copyright (C) 2003, 2004, 2005, 2006
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
@ -307,9 +307,10 @@ namespace __debug
splice(iterator __position, list& __x, iterator __i)
{
__glibcxx_check_insert(__position);
_GLIBCXX_DEBUG_VERIFY(__x.get_allocator() == this->get_allocator(),
_M_message(__gnu_debug::__msg_splice_alloc)
._M_sequence(*this)._M_sequence(__x, "__x"));
// We used to perform the splice_alloc check: not anymore, redundant
// after implementing the relevant bits of N1599.
_GLIBCXX_DEBUG_VERIFY(__i._M_dereferenceable(),
_M_message(__gnu_debug::__msg_splice_bad)
._M_iterator(__i, "__i"));
@ -332,9 +333,9 @@ namespace __debug
_M_message(__gnu_debug::__msg_splice_other)
._M_sequence(__x, "x")
._M_iterator(__first, "first"));
_GLIBCXX_DEBUG_VERIFY(__x.get_allocator() == this->get_allocator(),
_M_message(__gnu_debug::__msg_splice_alloc)
._M_sequence(*this)._M_sequence(__x));
// We used to perform the splice_alloc check: not anymore, redundant
// after implementing the relevant bits of N1599.
for (iterator __tmp = __first; __tmp != __last; )
{