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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 24d1849af7dcdcc2213e7229fa144ec7ad4cd80f..47c6b1fe52d1ee51c09ae5be14ed8ac4f79ce007 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -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

diff --git a/libstdc++-v3/src/c++11/debug.cc b/libstdc++-v3/src/c++11/debug.cc
index 673099429415e82bd1985e53b9ba0f5444f21c1b..cb64dd9240e7ceed4f8c64290181bd8015ee053d 100644 (file)
--- a/libstdc++-v3/src/c++11/debug.cc
+++ b/libstdc++-v3/src/c++11/debug.cc
@@ -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