aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libstdc++-v3/ChangeLog7
-rw-r--r--libstdc++-v3/include/debug/functions.h2
2 files changed, 8 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 611d43a..3a40f32 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2018-09-28 François Dumont <fdumont@gcc.gnu.org>
+
+ * 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 <mac@mcrowe.com>
* 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 21b60df..13059bb 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));
}