From 802743baca133c1ec130706120fb6cde138cbc46 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fran=C3=A7ois=20Dumont?= Date: Thu, 21 Jun 2018 05:36:48 +0000 Subject: [PATCH] debug.h (_Safe_iterator<>(const _Safe_iterator<_MutableIterator,>& __x)): Compare __x base iterator with a default initialized iterator of the same type. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2018-06-21 François Dumont * 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 --- libstdc++-v3/ChangeLog | 7 +++++++ libstdc++-v3/include/debug/safe_iterator.h | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 83bf2b92e0b..77605730bad 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2018-06-21 François Dumont + + * 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 PR libstdc++/70966 diff --git a/libstdc++-v3/include/debug/safe_iterator.h b/libstdc++-v3/include/debug/safe_iterator.h index 7ed2b93b407..b8256fc3a22 100644 --- 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 > 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")); -- 2.30.2