diff options
| author | Paolo Carlini <pcarlini@suse.de> | 2006-02-22 10:20:09 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2006-02-22 10:20:09 +0000 |
| commit | afde1de353a2274b39040c98da41b60b4fdfdced (patch) | |
| tree | 23300684f67214241d748e4894426e990589a41e /libstdc++-v3 | |
| parent | 6217ebd2773fc99341fa661fba6a29b4a3d99d98 (diff) | |
| download | gcc-afde1de353a2274b39040c98da41b60b4fdfdced.zip gcc-afde1de353a2274b39040c98da41b60b4fdfdced.tar.gz gcc-afde1de353a2274b39040c98da41b60b4fdfdced.tar.bz2 | |
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
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/debug/list | 15 |
2 files changed, 13 insertions, 7 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 39f58d4..fd7289a 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -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, diff --git a/libstdc++-v3/include/debug/list b/libstdc++-v3/include/debug/list index 9893766..0f5ef6e 100644 --- a/libstdc++-v3/include/debug/list +++ b/libstdc++-v3/include/debug/list @@ -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; ) { |