From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by sourceware.org (Postfix) with ESMTP id 6A82639540BC for ; Wed, 22 Apr 2020 21:58:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 6A82639540BC 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-330-UFJS_nDWN6qlcA1IrnS-9A-1; Wed, 22 Apr 2020 17:58:39 -0400 X-MC-Unique: UFJS_nDWN6qlcA1IrnS-9A-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 B541F18B9FE1; Wed, 22 Apr 2020 21:58:38 +0000 (UTC) Received: from localhost (unknown [10.33.36.131]) by smtp.corp.redhat.com (Postfix) with ESMTP id 619A55D714; Wed, 22 Apr 2020 21:58:38 +0000 (UTC) Date: Wed, 22 Apr 2020 22:58:37 +0100 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed 2/8] libstdc++: Remove non-standard feature test macros Message-ID: <0d2dbae406c0c524436d9f818f4e06b3ff7eb964.1587592482.git.jwakely@redhat.com> References: MIME-Version: 1.0 In-Reply-To: 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: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Content-Disposition: inline X-Spam-Status: No, score=-28.4 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: Wed, 22 Apr 2020 21:58:42 -0000 These macros were replaced by __cpp_lib_map_try_emplace and __cpp_lib_unordered_map_try_emplace, because those names are more descriptive. We've kept both old and new names so far, but I think we can remove the old ones now. =09* include/bits/stl_map.h (__cpp_lib_map_insertion): Remove old =09macro. =09* include/bits/unordered_map.h (__cpp_lib_unordered_map_insertion): =09Likewise. =09* include/std/version (__cpp_lib_map_insertion) =09(__cpp_lib_unordered_map_insertion): Remove. --- libstdc++-v3/ChangeLog | 7 +++++++ libstdc++-v3/include/bits/stl_map.h | 1 - libstdc++-v3/include/bits/unordered_map.h | 1 - libstdc++-v3/include/std/version | 2 -- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index dc0b1eecfb0..4fd72daa942 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,12 @@ 2020-04-22 Jonathan Wakely =20 +=09* include/bits/stl_map.h (__cpp_lib_map_insertion): Remove old +=09macro. +=09* include/bits/unordered_map.h (__cpp_lib_unordered_map_insertion): +=09Likewise. +=09* include/std/version (__cpp_lib_map_insertion) +=09(__cpp_lib_unordered_map_insertion): Remove. + =09* include/std/condition_variable (__cpp_lib_jthread): Remove =09redundant definition. =09* include/std/stop_token (__cpp_lib_jthread): Update macro value to diff --git a/libstdc++-v3/include/bits/stl_map.h b/libstdc++-v3/include/bit= s/stl_map.h index 5039efd86b7..2772d11462e 100644 --- a/libstdc++-v3/include/bits/stl_map.h +++ b/libstdc++-v3/include/bits/stl_map.h @@ -894,7 +894,6 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER =09{ _M_t._M_insert_range_unique(__first, __last); } =20 #if __cplusplus > 201402L -#define __cpp_lib_map_insertion 201411 /** * @brief Attempts to insert or assign a std::pair into the %map. * @param __k Key to use for finding a possibly existing pair in diff --git a/libstdc++-v3/include/bits/unordered_map.h b/libstdc++-v3/inclu= de/bits/unordered_map.h index ab1b1d52442..0071d62e462 100644 --- a/libstdc++-v3/include/bits/unordered_map.h +++ b/libstdc++-v3/include/bits/unordered_map.h @@ -657,7 +657,6 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER =20 =20 #if __cplusplus > 201402L -#define __cpp_lib_unordered_map_insertion 201411 /** * @brief Attempts to insert a std::pair into the %unordered_map. * @param __k Key to use for finding a possibly existing pair in diff --git a/libstdc++-v3/include/std/version b/libstdc++-v3/include/std/ve= rsion index dafb09f982a..48547c63014 100644 --- a/libstdc++-v3/include/std/version +++ b/libstdc++-v3/include/std/version @@ -134,7 +134,6 @@ #define __cpp_lib_invoke 201411L #define __cpp_lib_lcm 201606 #define __cpp_lib_make_from_tuple 201606 -#define __cpp_lib_map_insertion 201411 #define __cpp_lib_map_try_emplace 201411 #define __cpp_lib_math_special_functions 201603L #ifdef _GLIBCXX_HAS_GTHREADS @@ -156,7 +155,6 @@ #define __cpp_lib_shared_ptr_weak_type 201606 #define __cpp_lib_string_view 201803 // #define __cpp_lib_to_chars 201611L -#define __cpp_lib_unordered_map_insertion 201411 #define __cpp_lib_unordered_map_try_emplace 201411 #define __cpp_lib_variant 201606L #endif --=20 2.25.3