From patchwork Tue Apr 15 08:25:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 110458 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id EE55B3857B9F for ; Tue, 15 Apr 2025 08:29:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EE55B3857B9F Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=HoSQlIN2 X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTP id C29863857BB0 for ; Tue, 15 Apr 2025 08:26:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C29863857BB0 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org C29863857BB0 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1744705598; cv=none; b=NtegIY1XiKGF6yDWMiEspfEBUmlAd3IH0tolSWhigHQ45+vIKbocgiThTvADBr5dZEBPoe157d0T7bhzdT4xnaDoiWkBcWPcBzJ2liAudumS5jgK6feA2/P8sahhv0EU5x6cutA4ieJ1UOzCUUVkY4IGpo32A+utp4bo0M2QHQE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1744705598; c=relaxed/simple; bh=yop4ntoZosb7sUJDIgMY5hoLAY3cnsJ9t62CAUcV6nM=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=kvJratH0gLelFlk7aLFlfKKlLgp7jSayynG26LlbGJwKAP5Q6PyntxvWupMC4ssJRAZhmj3nRyzz5RAmXxE5vomyxhP7Q2xrXYhr41z8whbet1Z01/LA6tKuTENskdsnRySmUkZb/UHnHL6zxqCKdL0iDdMgQiTz1/ZsugKvxm4= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C29863857BB0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1744705598; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XQMKmzkZoyscbqePBI3X2zyH6Pw/JqIDluF/U9Kf7iA=; b=HoSQlIN2IWUHd18HsfTQuqWES9DB6RPb2ECKK9U7WNJSMdcJt51mvMNgMG2kSe+nrMj93Q oyt5poRlqwqcB/JjytZn4yNozY3iq92d3tfOr+L9owjHlvo5ZHnNBUrKla96lfgSsklMIA y4xYSSK7BZ9t7ZPtlZh5NPLcfV2r6qw= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-483-k3KmBWKCOqaM8clHc6Kpeg-1; Tue, 15 Apr 2025 04:26:36 -0400 X-MC-Unique: k3KmBWKCOqaM8clHc6Kpeg-1 X-Mimecast-MFC-AGG-ID: k3KmBWKCOqaM8clHc6Kpeg_1744705595 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 54AC0180025F; Tue, 15 Apr 2025 08:26:35 +0000 (UTC) Received: from localhost (unknown [10.42.28.12]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E6FC63001D0F; Tue, 15 Apr 2025 08:26:33 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Enable __gnu_test::test_container constructor for C++98 Date: Tue, 15 Apr 2025 09:25:35 +0100 Message-ID: <20250415082632.2239459-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Fi9XBPCe2DErRm_er9ZwWe9iKGG9L1EOJGd6XEVh070_1744705595 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.0 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_NONE, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~patchwork=sourceware.org@gcc.gnu.org The only reason this constructor wasn't defined for C++98 is that it uses constructor delegation, but that isn't necessary. libstdc++-v3/ChangeLog: * testsuite/util/testsuite_iterators.h (test_container): Define array constructor for C++98 as well. --- I don't remember why I defined this using a delegating constructor when it's actually fewer characters to call the base constructor directly. Tested x86_64-linux. Pushed to trunk. libstdc++-v3/testsuite/util/testsuite_iterators.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libstdc++-v3/testsuite/util/testsuite_iterators.h b/libstdc++-v3/testsuite/util/testsuite_iterators.h index 0df6dcc5af5..20539ecaca6 100644 --- a/libstdc++-v3/testsuite/util/testsuite_iterators.h +++ b/libstdc++-v3/testsuite/util/testsuite_iterators.h @@ -610,12 +610,10 @@ namespace __gnu_test test_container(T* _first, T* _last) : bounds(_first, _last) { } -#if __cplusplus >= 201103L template explicit - test_container(T (&arr)[N]) : test_container(arr, arr+N) + test_container(T (&arr)[N]) : bounds(arr, arr+N) { } -#endif ItType it(int pos)