debug.h (_Safe_iterator<>(const _Safe_iterator<_MutableIterator,>& __x)): Compare...

2018-06-21  François Dumont  <fdumont@gcc.gnu.org>

	* include/debug/debug.h
	(_Safe_iterator<>(const _Safe_iterator<_MutableIterator,>& __x)):
	Compare __x base iterator with a default initialized iterator of the
	same type.

From-SVN: r261831

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 83bf2b92e0be6d82ee89d7bd057217c158f6b474..77605730bad40ce014294e9bb09d95c37f769b3a 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2018-06-21  François Dumont  <fdumont@gcc.gnu.org>
+
+       * include/debug/debug.h
+       (_Safe_iterator<>(const _Safe_iterator<_MutableIterator,>& __x)):
+       Compare __x base iterator with a default initialized iterator of the
+       same type.
+
 2018-06-20  Jonathan Wakely  <jwakely@redhat.com>
 
        PR libstdc++/70966

diff --git a/libstdc++-v3/include/debug/safe_iterator.h b/libstdc++-v3/include/debug/safe_iterator.h
index 7ed2b93b407337ce9cd1eebd4b54e8de8a73e255..b8256fc3a22d602871431e90dcb2af781c8dfd6d 100644 (file)
--- a/libstdc++-v3/include/debug/safe_iterator.h
+++ b/libstdc++-v3/include/debug/safe_iterator.h
@@ -180,7 +180,7 @@ namespace __gnu_debug
          // _GLIBCXX_RESOLVE_LIB_DEFECTS
          // DR 408. Is vector<reverse_iterator<char*> > forbidden?
          _GLIBCXX_DEBUG_VERIFY(!__x._M_singular()
-                               || __x.base() == _Iterator(),
+                               || __x.base() == _MutableIterator(),
                                _M_message(__msg_init_const_singular)
                                ._M_iterator(*this, "this")
                                ._M_iterator(__x, "other"));