aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3
diff options
context:
space:
mode:
authorFrançois Dumont <fdumont@gcc.gnu.org>2018-06-21 05:36:48 +0000
committerFrançois Dumont <fdumont@gcc.gnu.org>2018-06-21 05:36:48 +0000
commit802743baca133c1ec130706120fb6cde138cbc46 (patch)
tree261dea1722ba8c8a6fd21ec31538fe4ddcd1ceae /libstdc++-v3
parenta788a23c33c2cbe2f92750d5782c612bb257305f (diff)
downloadgcc-802743baca133c1ec130706120fb6cde138cbc46.zip
gcc-802743baca133c1ec130706120fb6cde138cbc46.tar.gz
gcc-802743baca133c1ec130706120fb6cde138cbc46.tar.bz2
debug.h (_Safe_iterator<>(const _Safe_iterator<_MutableIterator,>& __x)): Compare __x base iterator with a default initialized iterator of the same type.
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
Diffstat (limited to 'libstdc++-v3')
-rw-r--r--libstdc++-v3/ChangeLog7
-rw-r--r--libstdc++-v3/include/debug/safe_iterator.h2
2 files changed, 8 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 83bf2b92..7760573 100644
--- 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 7ed2b93..b8256fc 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<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"));