Commit afde1de3 by Paolo Carlini Committed by Paolo Carlini

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
parent 6217ebd2
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> 2006-02-21 Benjamin Kosnik <bkoz@redhat.com>
* include/c_std/cmath.tcc: Use _GLIBCXX_BEGIN_NAMESPACE, * include/c_std/cmath.tcc: Use _GLIBCXX_BEGIN_NAMESPACE,
......
// Debugging list implementation -*- C++ -*- // Debugging list implementation -*- C++ -*-
// Copyright (C) 2003, 2004, 2005 // Copyright (C) 2003, 2004, 2005, 2006
// Free Software Foundation, Inc. // Free Software Foundation, Inc.
// //
// This file is part of the GNU ISO C++ Library. This library is free // This file is part of the GNU ISO C++ Library. This library is free
...@@ -307,9 +307,10 @@ namespace __debug ...@@ -307,9 +307,10 @@ namespace __debug
splice(iterator __position, list& __x, iterator __i) splice(iterator __position, list& __x, iterator __i)
{ {
__glibcxx_check_insert(__position); __glibcxx_check_insert(__position);
_GLIBCXX_DEBUG_VERIFY(__x.get_allocator() == this->get_allocator(),
_M_message(__gnu_debug::__msg_splice_alloc) // We used to perform the splice_alloc check: not anymore, redundant
._M_sequence(*this)._M_sequence(__x, "__x")); // after implementing the relevant bits of N1599.
_GLIBCXX_DEBUG_VERIFY(__i._M_dereferenceable(), _GLIBCXX_DEBUG_VERIFY(__i._M_dereferenceable(),
_M_message(__gnu_debug::__msg_splice_bad) _M_message(__gnu_debug::__msg_splice_bad)
._M_iterator(__i, "__i")); ._M_iterator(__i, "__i"));
...@@ -332,9 +333,9 @@ namespace __debug ...@@ -332,9 +333,9 @@ namespace __debug
_M_message(__gnu_debug::__msg_splice_other) _M_message(__gnu_debug::__msg_splice_other)
._M_sequence(__x, "x") ._M_sequence(__x, "x")
._M_iterator(__first, "first")); ._M_iterator(__first, "first"));
_GLIBCXX_DEBUG_VERIFY(__x.get_allocator() == this->get_allocator(),
_M_message(__gnu_debug::__msg_splice_alloc) // We used to perform the splice_alloc check: not anymore, redundant
._M_sequence(*this)._M_sequence(__x)); // after implementing the relevant bits of N1599.
for (iterator __tmp = __first; __tmp != __last; ) for (iterator __tmp = __first; __tmp != __last; )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment