From 86d0292b5f8d026785665e9cab8ba2b9d6ad8d60 Mon Sep 17 00:00:00 2001 From: redi Date: Thu, 8 Mar 2012 01:05:01 +0000 Subject: [PATCH] PR libstdc++/52433 * include/debug/safe_iterator.h (_Safe_iterator): Add debug checks to move constructor and move assignment operator. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@185089 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/include/debug/safe_iterator.h | 12 +++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index cf6d913..ce28ef1 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2012-03-08 Jonathan Wakely + + PR libstdc++/52433 + * include/debug/safe_iterator.h (_Safe_iterator): Add debug checks + to move constructor and move assignment operator. + 2012-03-05 Paolo Carlini * include/bits/stl_algobase.h (iter_swap): In C++11 mode simply diff --git a/libstdc++-v3/include/debug/safe_iterator.h b/libstdc++-v3/include/debug/safe_iterator.h index 65dff55..6bb3cd2 100644 --- a/libstdc++-v3/include/debug/safe_iterator.h +++ b/libstdc++-v3/include/debug/safe_iterator.h @@ -1,6 +1,6 @@ // Safe iterator implementation -*- C++ -*- -// Copyright (C) 2003, 2004, 2005, 2006, 2009, 2010, 2011 +// Copyright (C) 2003, 2004, 2005, 2006, 2009, 2010, 2011, 2012 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -176,6 +176,11 @@ namespace __gnu_debug */ _Safe_iterator(_Safe_iterator&& __x) : _M_current() { + _GLIBCXX_DEBUG_VERIFY(!__x._M_singular() + || __x._M_current == _Iterator(), + _M_message(__msg_init_copy_singular) + ._M_iterator(*this, "this") + ._M_iterator(__x, "other")); std::swap(_M_current, __x._M_current); this->_M_attach(__x._M_sequence); __x._M_detach(); @@ -229,6 +234,11 @@ namespace __gnu_debug _Safe_iterator& operator=(_Safe_iterator&& __x) { + _GLIBCXX_DEBUG_VERIFY(!__x._M_singular() + || __x._M_current == _Iterator(), + _M_message(__msg_copy_singular) + ._M_iterator(*this, "this") + ._M_iterator(__x, "other")); _M_current = __x._M_current; _M_attach(__x._M_sequence); __x._M_detach(); -- 2.7.4