From fa452a843d26a64a5ca0fd7c17ea1bd6e1b81a69 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 15 Dec 2020 11:40:07 +0000 Subject: [PATCH] libstdc++: Remove workaround for PR c++/78173 Now that the G++ bug is fixed we no longer need to protect this partial specialization from complaining about subtracting void pointers. libstdc++-v3/ChangeLog: * include/bits/iterator_concepts.h (incrementable_traits): Remove workaround for PR c++/78173. --- libstdc++-v3/include/bits/iterator_concepts.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libstdc++-v3/include/bits/iterator_concepts.h b/libstdc++-v3/include/bits/iterator_concepts.h index 6668caa8185..414a81e7249 100644 --- a/libstdc++-v3/include/bits/iterator_concepts.h +++ b/libstdc++-v3/include/bits/iterator_concepts.h @@ -163,10 +163,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template requires (!requires { typename _Tp::difference_type; } && requires(const _Tp& __a, const _Tp& __b) - { - requires (!is_void_v>); // PR c++/78173 - { __a - __b } -> integral; - }) + { { __a - __b } -> integral; }) struct incrementable_traits<_Tp> { using difference_type