From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id CB24C3890431 for ; Tue, 17 Aug 2021 13:27:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org CB24C3890431 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-420-yol0wH-XPdCo7CxW0sb7zg-1; Tue, 17 Aug 2021 09:27:13 -0400 X-MC-Unique: yol0wH-XPdCo7CxW0sb7zg-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E402B760C1; Tue, 17 Aug 2021 13:27:12 +0000 (UTC) Received: from localhost (unknown [10.33.36.8]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8D4D83AC4; Tue, 17 Aug 2021 13:27:12 +0000 (UTC) Date: Tue, 17 Aug 2021 14:27:11 +0100 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Rename __detail::__not_same_as helper Message-ID: MIME-Version: 1.0 X-Clacks-Overhead: GNU Terry Pratchett X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="fBWvWLnQEaRqUmzk" Content-Disposition: inline X-Spam-Status: No, score=-14.2 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libstdc++@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++ mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Aug 2021 13:27:17 -0000 --fBWvWLnQEaRqUmzk Content-Type: text/plain; charset=us-ascii Content-Disposition: inline This is done to match an editorial change in the working draft, to rename the exposition-only not-same-as helper to different-from. Signed-off-by: Jonathan Wakely libstdc++-v3/ChangeLog: * include/bits/ranges_util.h (__not_same_as): Rename to __different_from. * include/std/ranges (__not_same_as): Likewise. Tested powerpc64le-linux. Committed to trunk. --fBWvWLnQEaRqUmzk Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch.txt" commit c09cabb239179fcc8ed70f033f214d98a49eb378 Author: Jonathan Wakely Date: Mon Aug 16 18:10:04 2021 libstdc++: Rename __detail::__not_same_as helper This is done to match an editorial change in the working draft, to rename the exposition-only not-same-as helper to different-from. Signed-off-by: Jonathan Wakely libstdc++-v3/ChangeLog: * include/bits/ranges_util.h (__not_same_as): Rename to __different_from. * include/std/ranges (__not_same_as): Likewise. diff --git a/libstdc++-v3/include/bits/ranges_util.h b/libstdc++-v3/include/bits/ranges_util.h index 0ca203dd4b0..4e87cfc6ef1 100644 --- a/libstdc++-v3/include/bits/ranges_util.h +++ b/libstdc++-v3/include/bits/ranges_util.h @@ -54,7 +54,7 @@ namespace ranges && (is_pointer_v<_It> || requires(_It __it) { __it.operator->(); }); template - concept __not_same_as + concept __different_from = !same_as, remove_cvref_t<_Up>>; } // namespace __detail @@ -187,8 +187,8 @@ namespace ranges template concept __convertible_to_non_slicing = convertible_to<_From, _To> && !(is_pointer_v> && is_pointer_v> - && __not_same_as>, - remove_pointer_t>>); + && __different_from>, + remove_pointer_t>>); template concept __pair_like @@ -264,7 +264,7 @@ namespace ranges _M_size._M_size = __n; } - template<__detail::__not_same_as _Rng> + template<__detail::__different_from _Rng> requires borrowed_range<_Rng> && __detail::__convertible_to_non_slicing, _It> && convertible_to, _Sent> @@ -275,7 +275,7 @@ namespace ranges : subrange(__r, ranges::size(__r)) { } - template<__detail::__not_same_as _Rng> + template<__detail::__different_from _Rng> requires borrowed_range<_Rng> && __detail::__convertible_to_non_slicing, _It> && convertible_to, _Sent> @@ -296,7 +296,7 @@ namespace ranges : subrange{ranges::begin(__r), ranges::end(__r), __n} { } - template<__detail::__not_same_as _PairLike> + template<__detail::__different_from _PairLike> requires __detail::__pair_like_convertible_from<_PairLike, const _It&, const _Sent&> constexpr diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index fb8905fab08..3d49a26ee79 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -1057,7 +1057,7 @@ namespace views::__adaptor static void _S_fun(_Range&&) = delete; public: - template<__detail::__not_same_as _Tp> + template<__detail::__different_from _Tp> requires convertible_to<_Tp, _Range&> && requires { _S_fun(declval<_Tp>()); } constexpr --fBWvWLnQEaRqUmzk--