From patchwork Wed Apr 22 06:27:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 1274730 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gcc.gnu.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=gcSxH8A1; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 496Vpz6Pn5z9sPF for ; Wed, 22 Apr 2020 16:27:37 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CCF8C386F80F; Wed, 22 Apr 2020 06:27:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CCF8C386F80F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1587536854; bh=3ou1wm6zBb+nrK3Wldxr9Lwjfd/Dp2kyMyTyVLv8ovw=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=gcSxH8A1kzrZMYHS+Ie9TS3wWNpWlQhPN4593WjBY28C/2ua1xUYml+jugHvsuF15 wPf48flgCJ5eZ3zPPZry+DQSGiHOZaCCtuAC2hJ+1PHtVTtcFmS+t/ayy+JliLJTdY MWQlfhWlzW10GmxxS/Wz0NM7PghLkX6/2bmhC2JE= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by sourceware.org (Postfix) with ESMTP id 4AED7386F02B for ; Wed, 22 Apr 2020 06:27:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 4AED7386F02B 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-341-u48pkI5MO4CYidwJY13C3A-1; Wed, 22 Apr 2020 02:27:28 -0400 X-MC-Unique: u48pkI5MO4CYidwJY13C3A-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 14D2F1005509; Wed, 22 Apr 2020 06:27:27 +0000 (UTC) Received: from localhost (unknown [10.33.36.131]) by smtp.corp.redhat.com (Postfix) with ESMTP id 90A8A60BEC; Wed, 22 Apr 2020 06:27:26 +0000 (UTC) Date: Wed, 22 Apr 2020 07:27:25 +0100 To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Improve tests for __cpp_lib_erase_if macro Message-ID: <20200422062725.GA2294909@redhat.com> MIME-Version: 1.0 X-Clacks-Overhead: GNU Terry Pratchett X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline X-Spam-Status: No, score=-29.5 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, RCVD_IN_MSPIKE_H2, 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: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jonathan Wakely via Gcc-patches From: Jonathan Wakely Reply-To: Jonathan Wakely Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" * testsuite/21_strings/basic_string/erasure.cc: Check for updated value of __cpp_lib_erase_if. * testsuite/23_containers/deque/erasure.cc: Likewise. * 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 x86_64-linux, committed to master. commit 0fe9eaaa083b6cc032cbd3ad1286b1dd73ccdf54 Author: Jonathan Wakely Date: Wed Apr 22 07:21:01 2020 +0100 libstdc++: Improve tests for __cpp_lib_erase_if macro * testsuite/21_strings/basic_string/erasure.cc: Check for updated value of __cpp_lib_erase_if. * testsuite/23_containers/deque/erasure.cc: Likewise. * 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/testsuite/21_strings/basic_string/erasure.cc b/libstdc++-v3/testsuite/21_strings/basic_string/erasure.cc index 6e475cf40bc..f36562a3f19 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string/erasure.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string/erasure.cc @@ -21,6 +21,12 @@ #include #include +#ifndef __cpp_lib_erase_if +# error "Feature-test macro for erase_if missing in " +#elif __cpp_lib_erase_if < 202002 +# error "Feature-test macro for erase_if has wrong value in " +#endif + void test01() { diff --git a/libstdc++-v3/testsuite/23_containers/deque/erasure.cc b/libstdc++-v3/testsuite/23_containers/deque/erasure.cc index 328e2fdbefa..8bd0206c890 100644 --- a/libstdc++-v3/testsuite/23_containers/deque/erasure.cc +++ b/libstdc++-v3/testsuite/23_containers/deque/erasure.cc @@ -22,9 +22,9 @@ #include #ifndef __cpp_lib_erase_if -# error "Feature-test macro for erase_if missing" +# error "Feature-test macro for erase_if missing in " #elif __cpp_lib_erase_if < 202002 -# error "Feature-test macro for erase_if has wrong value" +# error "Feature-test macro for erase_if has wrong value in " #endif void diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/erasure.cc b/libstdc++-v3/testsuite/23_containers/forward_list/erasure.cc index ce321cf0c59..133dc3a699b 100644 --- a/libstdc++-v3/testsuite/23_containers/forward_list/erasure.cc +++ b/libstdc++-v3/testsuite/23_containers/forward_list/erasure.cc @@ -22,9 +22,9 @@ #include #ifndef __cpp_lib_erase_if -# error "Feature-test macro for erase_if missing" +# error "Feature-test macro for erase_if missing in " #elif __cpp_lib_erase_if < 202002 -# error "Feature-test macro for erase_if has wrong value" +# error "Feature-test macro for erase_if has wrong value in " #endif void diff --git a/libstdc++-v3/testsuite/23_containers/list/erasure.cc b/libstdc++-v3/testsuite/23_containers/list/erasure.cc index 2b543d2f321..3620342ba9a 100644 --- a/libstdc++-v3/testsuite/23_containers/list/erasure.cc +++ b/libstdc++-v3/testsuite/23_containers/list/erasure.cc @@ -22,9 +22,9 @@ #include #ifndef __cpp_lib_erase_if -# error "Feature-test macro for erase_if missing" +# error "Feature-test macro for erase_if missing in " #elif __cpp_lib_erase_if < 202002 -# error "Feature-test macro for erase_if has wrong value" +# error "Feature-test macro for erase_if has wrong value in " #endif void diff --git a/libstdc++-v3/testsuite/23_containers/map/erasure.cc b/libstdc++-v3/testsuite/23_containers/map/erasure.cc index 4575e191267..1bd84813a97 100644 --- a/libstdc++-v3/testsuite/23_containers/map/erasure.cc +++ b/libstdc++-v3/testsuite/23_containers/map/erasure.cc @@ -23,9 +23,9 @@ #include #ifndef __cpp_lib_erase_if -# error "Feature-test macro for erase_if missing" +# error "Feature-test macro for erase_if missing in " #elif __cpp_lib_erase_if < 202002 -# error "Feature-test macro for erase_if has wrong value" +# error "Feature-test macro for erase_if has wrong value in " #endif auto is_odd_pair = [](const std::pair& p) diff --git a/libstdc++-v3/testsuite/23_containers/set/erasure.cc b/libstdc++-v3/testsuite/23_containers/set/erasure.cc index 48e70db814f..e5cc4a2c949 100644 --- a/libstdc++-v3/testsuite/23_containers/set/erasure.cc +++ b/libstdc++-v3/testsuite/23_containers/set/erasure.cc @@ -22,9 +22,9 @@ #include #ifndef __cpp_lib_erase_if -# error "Feature-test macro for erase_if missing" +# error "Feature-test macro for erase_if missing in " #elif __cpp_lib_erase_if < 202002 -# error "Feature-test macro for erase_if has wrong value" +# error "Feature-test macro for erase_if has wrong value in " #endif auto is_odd = [](const int i) { return i % 2 != 0; }; diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/erasure.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/erasure.cc index a5af7f02d4f..d08510f789c 100644 --- a/libstdc++-v3/testsuite/23_containers/unordered_map/erasure.cc +++ b/libstdc++-v3/testsuite/23_containers/unordered_map/erasure.cc @@ -23,9 +23,9 @@ #include #ifndef __cpp_lib_erase_if -# error "Feature-test macro for erase_if missing" +# error "Feature-test macro for erase_if missing in " #elif __cpp_lib_erase_if < 202002 -# error "Feature-test macro for erase_if has wrong value" +# error "Feature-test macro for erase_if has wrong value in " #endif auto is_odd_pair = [](const std::pair& p) diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/erasure.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/erasure.cc index c129b1bbfd3..bc719d6a1dd 100644 --- a/libstdc++-v3/testsuite/23_containers/unordered_set/erasure.cc +++ b/libstdc++-v3/testsuite/23_containers/unordered_set/erasure.cc @@ -22,9 +22,9 @@ #include #ifndef __cpp_lib_erase_if -# error "Feature-test macro for erase_if missing" +# error "Feature-test macro for erase_if missing in " #elif __cpp_lib_erase_if < 202002 -# error "Feature-test macro for erase_if has wrong value" +# error "Feature-test macro for erase_if has wrong value in " #endif void diff --git a/libstdc++-v3/testsuite/23_containers/vector/erasure.cc b/libstdc++-v3/testsuite/23_containers/vector/erasure.cc index c3fb41f576b..548068741d2 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/erasure.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/erasure.cc @@ -22,9 +22,9 @@ #include #ifndef __cpp_lib_erase_if -# error "Feature-test macro for erase_if missing" +# error "Feature-test macro for erase_if missing in " #elif __cpp_lib_erase_if < 202002 -# error "Feature-test macro for erase_if has wrong value" +# error "Feature-test macro for erase_if has wrong value in " #endif void