From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 46721 invoked by alias); 15 Feb 2020 10:42:36 -0000 Mailing-List: contact libstdc++-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libstdc++-owner@gcc.gnu.org Received: (qmail 46651 invoked by uid 89); 15 Feb 2020 10:42:35 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-18.0 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 spammy= X-HELO: us-smtp-1.mimecast.com Received: from us-smtp-delivery-1.mimecast.com (HELO us-smtp-1.mimecast.com) (205.139.110.120) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 15 Feb 2020 10:42:33 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581763352; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=36dXjTsQctSgAAjGMMZKEbvKEry4rBPC4caJbY0tDeg=; b=L9YHJ25MqKDEO+q8L9T3byep+NwtiglZI10OsUnG0bC3oILENekrtPNSGUs4faaLJ6WgwP eWNYtXonBnsegoIdCJXkuQ60j7CxRwJ7d+z8KZhRsvYEODjIBhGrnUsyTHhrZXXFfPOUVA 8xyFrnu8XRxpUU9ZpoOzgjcGYKnbhFs= 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-40-0QFO-Em6Mw-qG3wRf76Flg-1; Sat, 15 Feb 2020 05:42:28 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 264F21800D6B; Sat, 15 Feb 2020 10:42:27 +0000 (UTC) Received: from localhost (ovpn-204-70.brq.redhat.com [10.40.204.70]) by smtp.corp.redhat.com (Postfix) with ESMTP id BB544171D6; Sat, 15 Feb 2020 10:42:24 +0000 (UTC) Date: Sat, 15 Feb 2020 10:42:00 -0000 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [PATCH] libstdc++: Update __cpp_lib_erase_if macro (P1115R3) Message-ID: <20200215104221.GA1464310@redhat.com> MIME-Version: 1.0 X-Clacks-Overhead: GNU Terry Pratchett X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="vkogqOf2sHV7VnPd" Content-Disposition: inline X-IsSubscribed: yes X-SW-Source: 2020-02/txt/msg00079.txt.bz2 --vkogqOf2sHV7VnPd Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-length: 887 Now that this feature has been approved for C++20 we can define the macro to the official value. * include/bits/erase_if.h (__cpp_lib_erase_if): Define to 202002L. * include/std/deque: Likewise. * include/std/forward_list: Likewise. * include/std/list: Likewise. * include/std/string: Likewise. * include/std/vector: Likewise. * include/std/version: Likewise. * testsuite/23_containers/deque/erasure.cc: Test for new value. * testsuite/23_containers/forward_list/erasure.cc: Likewise. * testsuite/23_containers/list/erasure.cc: Likewise. * testsuite/23_containers/map/erasure.cc: Likewise. * testsuite/23_containers/set/erasure.cc: Likewise. * testsuite/23_containers/unordered_map/erasure.cc: Likewise. * testsuite/23_containers/unordered_set/erasure.cc: Likewise. * testsuite/23_containers/vector/erasure.cc: Likewise. Tested powerpc64le-linux, committed to master. --vkogqOf2sHV7VnPd Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch.txt" Content-Transfer-Encoding: quoted-printable Content-length: 8897 commit 55b00d14f4daf671b865550c119dafdeb3139672 Author: Jonathan Wakely Date: Sat Feb 15 09:02:30 2020 +0000 libstdc++: Update __cpp_lib_erase_if macro (P1115R3) =20=20=20=20 Now that this feature has been approved for C++20 we can define the macro to the official value. =20=20=20=20 * include/bits/erase_if.h (__cpp_lib_erase_if): Define to 20200= 2L. * include/std/deque: Likewise. * include/std/forward_list: Likewise. * include/std/list: Likewise. * include/std/string: Likewise. * include/std/vector: Likewise. * include/std/version: Likewise. * testsuite/23_containers/deque/erasure.cc: Test for new value. * testsuite/23_containers/forward_list/erasure.cc: Likewise. * testsuite/23_containers/list/erasure.cc: Likewise. * testsuite/23_containers/map/erasure.cc: Likewise. * testsuite/23_containers/set/erasure.cc: Likewise. * testsuite/23_containers/unordered_map/erasure.cc: Likewise. * testsuite/23_containers/unordered_set/erasure.cc: Likewise. * testsuite/23_containers/vector/erasure.cc: Likewise. diff --git a/libstdc++-v3/include/bits/erase_if.h b/libstdc++-v3/include/bi= ts/erase_if.h index 2641fe63ba3..dc5e6ae584f 100644 --- a/libstdc++-v3/include/bits/erase_if.h +++ b/libstdc++-v3/include/bits/erase_if.h @@ -39,7 +39,7 @@ namespace std _GLIBCXX_BEGIN_NAMESPACE_VERSION =20 #if __cplusplus > 201703L -# define __cpp_lib_erase_if 201900L +# define __cpp_lib_erase_if 202002L #endif =20 namespace __detail diff --git a/libstdc++-v3/include/std/deque b/libstdc++-v3/include/std/deque index efe04dbbb7c..07e2c69d02d 100644 --- a/libstdc++-v3/include/std/deque +++ b/libstdc++-v3/include/std/deque @@ -91,7 +91,7 @@ namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION =20 -#define __cpp_lib_erase_if 201900L +#define __cpp_lib_erase_if 202002L =20 template inline typename deque<_Tp, _Alloc>::size_type diff --git a/libstdc++-v3/include/std/forward_list b/libstdc++-v3/include/s= td/forward_list index 8eb1ad150a7..439ef6b380c 100644 --- a/libstdc++-v3/include/std/forward_list +++ b/libstdc++-v3/include/std/forward_list @@ -62,7 +62,7 @@ namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION =20 -#define __cpp_lib_erase_if 201900L +#define __cpp_lib_erase_if 202002L =20 template inline typename forward_list<_Tp, _Alloc>::size_type=20 diff --git a/libstdc++-v3/include/std/list b/libstdc++-v3/include/std/list index 1fb51a5abb4..7b3d3c2e888 100644 --- a/libstdc++-v3/include/std/list +++ b/libstdc++-v3/include/std/list @@ -86,7 +86,7 @@ namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION =20 -#define __cpp_lib_erase_if 201900L +#define __cpp_lib_erase_if 202002L =20 template inline typename list<_Tp, _Alloc>::size_type diff --git a/libstdc++-v3/include/std/string b/libstdc++-v3/include/std/str= ing index 6a3b61f8622..a95ef4dd541 100644 --- a/libstdc++-v3/include/std/string +++ b/libstdc++-v3/include/std/string @@ -118,7 +118,7 @@ namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION =20 -#define __cpp_lib_erase_if 201900L +#define __cpp_lib_erase_if 202002L =20 template diff --git a/libstdc++-v3/include/std/vector b/libstdc++-v3/include/std/vec= tor index 2a7b4c0f629..6f587a82a09 100644 --- a/libstdc++-v3/include/std/vector +++ b/libstdc++-v3/include/std/vector @@ -101,7 +101,7 @@ namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION =20 -#define __cpp_lib_erase_if 201900L +#define __cpp_lib_erase_if 202002L =20 template inline typename vector<_Tp, _Alloc>::size_type diff --git a/libstdc++-v3/include/std/version b/libstdc++-v3/include/std/ve= rsion index d8a97767453..8a4affa60a0 100644 --- a/libstdc++-v3/include/std/version +++ b/libstdc++-v3/include/std/version @@ -184,7 +184,7 @@ #define __cpp_lib_constexpr_complex 201711L #define __cpp_lib_constexpr_dynamic_alloc 201907L #define __cpp_lib_constexpr_invoke 201907L -#define __cpp_lib_erase_if 201900L +#define __cpp_lib_erase_if 202002L #define __cpp_lib_interpolate 201902L #ifdef _GLIBCXX_HAS_GTHREADS # define __cpp_lib_jthread 201907L diff --git a/libstdc++-v3/testsuite/23_containers/deque/erasure.cc b/libstd= c++-v3/testsuite/23_containers/deque/erasure.cc index 31c9e93de30..328e2fdbefa 100644 --- a/libstdc++-v3/testsuite/23_containers/deque/erasure.cc +++ b/libstdc++-v3/testsuite/23_containers/deque/erasure.cc @@ -23,7 +23,7 @@ =20 #ifndef __cpp_lib_erase_if # error "Feature-test macro for erase_if missing" -#elif __cpp_lib_erase_if < 201811 +#elif __cpp_lib_erase_if < 202002 # error "Feature-test macro for erase_if has wrong value" #endif =20 diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/erasure.cc b= /libstdc++-v3/testsuite/23_containers/forward_list/erasure.cc index 9f81923ac75..ce321cf0c59 100644 --- a/libstdc++-v3/testsuite/23_containers/forward_list/erasure.cc +++ b/libstdc++-v3/testsuite/23_containers/forward_list/erasure.cc @@ -23,7 +23,7 @@ =20 #ifndef __cpp_lib_erase_if # error "Feature-test macro for erase_if missing" -#elif __cpp_lib_erase_if < 201811 +#elif __cpp_lib_erase_if < 202002 # error "Feature-test macro for erase_if has wrong value" #endif =20 diff --git a/libstdc++-v3/testsuite/23_containers/list/erasure.cc b/libstdc= ++-v3/testsuite/23_containers/list/erasure.cc index 9f6b30caea5..2b543d2f321 100644 --- a/libstdc++-v3/testsuite/23_containers/list/erasure.cc +++ b/libstdc++-v3/testsuite/23_containers/list/erasure.cc @@ -23,7 +23,7 @@ =20 #ifndef __cpp_lib_erase_if # error "Feature-test macro for erase_if missing" -#elif __cpp_lib_erase_if < 201811 +#elif __cpp_lib_erase_if < 202002 # error "Feature-test macro for erase_if has wrong value" #endif =20 diff --git a/libstdc++-v3/testsuite/23_containers/map/erasure.cc b/libstdc+= +-v3/testsuite/23_containers/map/erasure.cc index 50f49241234..4575e191267 100644 --- a/libstdc++-v3/testsuite/23_containers/map/erasure.cc +++ b/libstdc++-v3/testsuite/23_containers/map/erasure.cc @@ -24,7 +24,7 @@ =20 #ifndef __cpp_lib_erase_if # error "Feature-test macro for erase_if missing" -#elif __cpp_lib_erase_if < 201811 +#elif __cpp_lib_erase_if < 202002 # error "Feature-test macro for erase_if has wrong value" #endif =20 diff --git a/libstdc++-v3/testsuite/23_containers/set/erasure.cc b/libstdc+= +-v3/testsuite/23_containers/set/erasure.cc index 4af4c6d739d..48e70db814f 100644 --- a/libstdc++-v3/testsuite/23_containers/set/erasure.cc +++ b/libstdc++-v3/testsuite/23_containers/set/erasure.cc @@ -23,7 +23,7 @@ =20 #ifndef __cpp_lib_erase_if # error "Feature-test macro for erase_if missing" -#elif __cpp_lib_erase_if < 201811 +#elif __cpp_lib_erase_if < 202002 # error "Feature-test macro for erase_if has wrong value" #endif =20 diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/erasure.cc = b/libstdc++-v3/testsuite/23_containers/unordered_map/erasure.cc index 46ae69b3b97..a5af7f02d4f 100644 --- a/libstdc++-v3/testsuite/23_containers/unordered_map/erasure.cc +++ b/libstdc++-v3/testsuite/23_containers/unordered_map/erasure.cc @@ -24,7 +24,7 @@ =20 #ifndef __cpp_lib_erase_if # error "Feature-test macro for erase_if missing" -#elif __cpp_lib_erase_if < 201811 +#elif __cpp_lib_erase_if < 202002 # error "Feature-test macro for erase_if has wrong value" #endif =20 diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/erasure.cc = b/libstdc++-v3/testsuite/23_containers/unordered_set/erasure.cc index b3138bfe5b1..c129b1bbfd3 100644 --- a/libstdc++-v3/testsuite/23_containers/unordered_set/erasure.cc +++ b/libstdc++-v3/testsuite/23_containers/unordered_set/erasure.cc @@ -23,7 +23,7 @@ =20 #ifndef __cpp_lib_erase_if # error "Feature-test macro for erase_if missing" -#elif __cpp_lib_erase_if < 201811 +#elif __cpp_lib_erase_if < 202002 # error "Feature-test macro for erase_if has wrong value" #endif =20 diff --git a/libstdc++-v3/testsuite/23_containers/vector/erasure.cc b/libst= dc++-v3/testsuite/23_containers/vector/erasure.cc index 470832c71aa..c3fb41f576b 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/erasure.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/erasure.cc @@ -23,7 +23,7 @@ =20 #ifndef __cpp_lib_erase_if # error "Feature-test macro for erase_if missing" -#elif __cpp_lib_erase_if < 201811 +#elif __cpp_lib_erase_if < 202002 # error "Feature-test macro for erase_if has wrong value" #endif =20 --vkogqOf2sHV7VnPd--