From 5c441345a343d0ef90e5ac9ef95039030ecef1ee Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fran=C3=A7ois=20Dumont?= Date: Fri, 28 Sep 2018 20:26:29 +0000 Subject: [PATCH] functions.h (__foreign_iterator_aux3(const _Safe_iterator<>&, const _InputeIter&, const _InputIter&, __true_type)): Use empty() rather than begin() == end(). MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2018-09-28 François Dumont * include/debug/functions.h (__foreign_iterator_aux3(const _Safe_iterator<>&, const _InputeIter&, const _InputIter&, __true_type)): Use empty() rather than begin() == end(). From-SVN: r264699 --- libstdc++-v3/ChangeLog | 7 +++++++ libstdc++-v3/include/debug/functions.h | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 611d43ac1bb..3a40f329348 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2018-09-28 François Dumont + + * include/debug/functions.h + (__foreign_iterator_aux3(const _Safe_iterator<>&, const _InputeIter&, + const _InputIter&, __true_type)): Use empty() rather than begin() == + end(). + 2018-09-25 Mike Crowe * include/std/condition_variable (condition_variable::wait_for): Use diff --git a/libstdc++-v3/include/debug/functions.h b/libstdc++-v3/include/debug/functions.h index 21b60df16ed..13059bbf463 100644 --- a/libstdc++-v3/include/debug/functions.h +++ b/libstdc++-v3/include/debug/functions.h @@ -123,7 +123,7 @@ namespace __gnu_debug { if (__other == __other_end) return true; // inserting nothing is safe even if not foreign iters - if (__it._M_get_sequence()->begin() == __it._M_get_sequence()->end()) + if (__it._M_get_sequence()->empty()) return true; // can't be self-inserting if self is empty return __foreign_iterator_aux4(__it, std::__addressof(*__other)); } -- 2.30.2