From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 45215384B061; Tue, 15 Dec 2020 11:46:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 45215384B061 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r11-6074] libstdc++: Remove workaround for PR c++/78173 X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: a929b39aa32a6bc65158bd8e32ce96bc1c906065 X-Git-Newrev: fa452a843d26a64a5ca0fd7c17ea1bd6e1b81a69 Message-Id: <20201215114600.45215384B061@sourceware.org> Date: Tue, 15 Dec 2020 11:46:00 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Dec 2020 11:46:00 -0000 https://gcc.gnu.org/g:fa452a843d26a64a5ca0fd7c17ea1bd6e1b81a69 commit r11-6074-gfa452a843d26a64a5ca0fd7c17ea1bd6e1b81a69 Author: Jonathan Wakely Date: Tue Dec 15 11:40:07 2020 +0000 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. Diff: --- 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