Hi
I always wanted to fix those operators implementation so that it
just use underlying iterator -> operator like for the other operators.
And I also notice the @todo on it today so maybe it is still time to fix
those.
* include/debug/safe_iterator.h
(_Safe_iterator<>::operator->()): Implement using underlying iterator
same operator.
* include/debug/safe_local_iterator.h
(_Safe_local_iterator<>::operator->()): Likewise.
Tested under Linux x86_64 debug mode of course.
François
diff --git a/libstdc++-v3/include/debug/safe_iterator.h b/libstdc++-v3/include/debug/safe_iterator.h
index a8bee21..ed08d19 100644
--- a/libstdc++-v3/include/debug/safe_iterator.h
+++ b/libstdc++-v3/include/debug/safe_iterator.h
@@ -274,7 +274,6 @@ namespace __gnu_debug
/**
* @brief Iterator dereference.
* @pre iterator is dereferenceable
- * @todo Make this correct w.r.t. iterators that return proxies
*/
pointer
operator->() const _GLIBCXX_NOEXCEPT
@@ -282,7 +281,7 @@ namespace __gnu_debug
_GLIBCXX_DEBUG_VERIFY(this->_M_dereferenceable(),
_M_message(__msg_bad_deref)
._M_iterator(*this, "this"));
- return std::__addressof(*base());
+ return base().operator->();
}
// ------ Input iterator requirements ------
diff --git a/libstdc++-v3/include/debug/safe_local_iterator.h b/libstdc++-v3/include/debug/safe_local_iterator.h
index 350a1d2..f60b6e9 100644
--- a/libstdc++-v3/include/debug/safe_local_iterator.h
+++ b/libstdc++-v3/include/debug/safe_local_iterator.h
@@ -236,7 +236,6 @@ namespace __gnu_debug
/**
* @brief Iterator dereference.
* @pre iterator is dereferenceable
- * @todo Make this correct w.r.t. iterators that return proxies
*/
pointer
operator->() const
@@ -244,7 +243,7 @@ namespace __gnu_debug
_GLIBCXX_DEBUG_VERIFY(this->_M_dereferenceable(),
_M_message(__msg_bad_deref)
._M_iterator(*this, "this"));
- return std::__addressof(*base());
+ return base().operator->();
}
// ------ Input iterator requirements ------
