re PR libstdc++/52433 ([C++11] debug mode iterators need to move)
PR libstdc++/52433 * include/debug/safe_iterator.h (_Safe_iterator): Add debug checks to move constructor and move assignment operator. From-SVN: r185089
This commit is contained in:
parent
79bb38d3b5
commit
8ad8655c6e
|
@ -1,3 +1,9 @@
|
||||||
|
2012-03-08 Jonathan Wakely <jwakely.gcc@gmail.com>
|
||||||
|
|
||||||
|
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 <paolo.carlini@oracle.com>
|
2012-03-05 Paolo Carlini <paolo.carlini@oracle.com>
|
||||||
|
|
||||||
* include/bits/stl_algobase.h (iter_swap): In C++11 mode simply
|
* include/bits/stl_algobase.h (iter_swap): In C++11 mode simply
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
// Safe iterator implementation -*- C++ -*-
|
// 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.
|
// 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
|
||||||
|
@ -176,6 +176,11 @@ namespace __gnu_debug
|
||||||
*/
|
*/
|
||||||
_Safe_iterator(_Safe_iterator&& __x) : _M_current()
|
_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);
|
std::swap(_M_current, __x._M_current);
|
||||||
this->_M_attach(__x._M_sequence);
|
this->_M_attach(__x._M_sequence);
|
||||||
__x._M_detach();
|
__x._M_detach();
|
||||||
|
@ -229,6 +234,11 @@ namespace __gnu_debug
|
||||||
_Safe_iterator&
|
_Safe_iterator&
|
||||||
operator=(_Safe_iterator&& __x)
|
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_current = __x._M_current;
|
||||||
_M_attach(__x._M_sequence);
|
_M_attach(__x._M_sequence);
|
||||||
__x._M_detach();
|
__x._M_detach();
|
||||||
|
|
Loading…
Reference in New Issue