mirror of
https://github.com/gcc-mirror/gcc.git
synced 2026-05-06 23:25:24 +02:00
2018-06-07 François Dumont <fdumont@gcc.gnu.org>
* src/c++11/debug.cc (_Safe_iterator_base::_M_detach()): Reset state only if needed. (_Safe_iterator_base::_M_detach_single()): Likewise. (_Safe_local_iterator_base::_M_detach()): Reset state only if needed. (_Safe_local_iterator_base::_M_detach_single()): Likewise. From-SVN: r261262
This commit is contained in:
@@ -1,3 +1,11 @@
|
||||
2018-06-07 François Dumont <fdumont@gcc.gnu.org>
|
||||
|
||||
* src/c++11/debug.cc
|
||||
(_Safe_iterator_base::_M_detach()): Reset state only if needed.
|
||||
(_Safe_iterator_base::_M_detach_single()): Likewise.
|
||||
(_Safe_local_iterator_base::_M_detach()): Reset state only if needed.
|
||||
(_Safe_local_iterator_base::_M_detach_single()): Likewise.
|
||||
|
||||
2018-06-06 Jonathan Wakely <jwakely@redhat.com>
|
||||
|
||||
* include/bits/shared_ptr_base.h (__shared_count): Remove redundant
|
||||
|
||||
@@ -377,9 +377,10 @@ namespace __gnu_debug
|
||||
_M_detach()
|
||||
{
|
||||
if (_M_sequence)
|
||||
_M_sequence->_M_detach(this);
|
||||
|
||||
_M_reset();
|
||||
{
|
||||
_M_sequence->_M_detach(this);
|
||||
_M_reset();
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
@@ -387,9 +388,10 @@ namespace __gnu_debug
|
||||
_M_detach_single() throw ()
|
||||
{
|
||||
if (_M_sequence)
|
||||
_M_sequence->_M_detach_single(this);
|
||||
|
||||
_M_reset();
|
||||
{
|
||||
_M_sequence->_M_detach_single(this);
|
||||
_M_reset();
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
@@ -460,9 +462,10 @@ namespace __gnu_debug
|
||||
_M_detach()
|
||||
{
|
||||
if (_M_sequence)
|
||||
_M_get_container()->_M_detach_local(this);
|
||||
|
||||
_M_reset();
|
||||
{
|
||||
_M_get_container()->_M_detach_local(this);
|
||||
_M_reset();
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
@@ -470,9 +473,10 @@ namespace __gnu_debug
|
||||
_M_detach_single() throw ()
|
||||
{
|
||||
if (_M_sequence)
|
||||
_M_get_container()->_M_detach_local_single(this);
|
||||
|
||||
_M_reset();
|
||||
{
|
||||
_M_get_container()->_M_detach_local_single(this);
|
||||
_M_reset();
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
|
||||
Reference in New Issue
Block a user