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.129.124]) by sourceware.org (Postfix) with ESMTPS id BB467385842B for ; Tue, 4 Oct 2022 16:46:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org BB467385842B Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664902000; 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=gB2R2GvcX+0zBVQFUCI1UvCsY/vy7QPMSAFwnlev3us=; b=fUyENv53/JL8WtLr4HEBzhKQP+0X8lAepg1NIHWO2/exYvOv0pM6tg+2YTM/whLwYh3XMm Y5wE6LnYzvGuxF11sXHxPeSTo2bWRtueUHrKRgzJP4v5osZ8PgbNSBDM/irOmhY8Nwm6B3 Bjje0nLflaHs8bmfc4FZI74Ot/YgApE= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-605-b3R98sNWM_y-cjkX0cEs2w-1; Tue, 04 Oct 2022 12:46:39 -0400 X-MC-Unique: b3R98sNWM_y-cjkX0cEs2w-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CBCF6100F7F3; Tue, 4 Oct 2022 16:46:38 +0000 (UTC) Received: from localhost (unknown [10.33.36.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id 92F051121314; Tue, 4 Oct 2022 16:46:38 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Fix test FAIL for old std::string ABI Date: Tue, 4 Oct 2022 17:46:37 +0100 Message-Id: <20221004164637.558771-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.3 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,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 List-Id: Tested powerpc64le-linux. Pushed to trunk. -- >8 -- libstdc++-v3/ChangeLog: * testsuite/std/ranges/adaptors/join_with/1.cc: Remove unused #include -#include -#include +#include #include #include @@ -73,7 +72,10 @@ test03() return true; } -constexpr bool +#if _GLIBCXX_USE_CXX11_ABI +constexpr +#endif +bool test04() { std::string rs[] = {"a", "", "b", "", "c"}; @@ -93,5 +95,9 @@ main() static_assert(test01()); static_assert(test02()); static_assert(test03()); +#if _GLIBCXX_USE_CXX11_ABI static_assert(test04()); +#else + VERIFY(test04()); +#endif } -- 2.37.3