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.133.124]) by sourceware.org (Postfix) with ESMTPS id 3202F3836025 for ; Fri, 11 Nov 2022 05:31:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 3202F3836025 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=1668144660; 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=lO2v9GHqV4+1UhHyOMpznpPZIMxP7eh8nd509D4NQz0=; b=PyHuHXCvP1Ml9/cCQEPSMbfjgex26xmZHPiLWW71bRt4JanADWhkMv9DEZ1hS2pKdQv1jM 8/OJ974FqUSoMa30pX916+65ZJ3tR28POsOswxZbqn0HQHcK9V6wDvWK0jUxO+/3vUnHdN z0GQ72JqAPTFmMkGWiRfFzhFxiaqyJM= 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-586-cvAzjio5OkKi6XIyky2hZA-1; Fri, 11 Nov 2022 00:30:55 -0500 X-MC-Unique: cvAzjio5OkKi6XIyky2hZA-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 1BE5486F122; Fri, 11 Nov 2022 05:30:55 +0000 (UTC) Received: from localhost (unknown [10.33.36.199]) by smtp.corp.redhat.com (Postfix) with ESMTP id D9CCA1121330; Fri, 11 Nov 2022 05:30:54 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Fix test that uses C++17 variable template in C++14 Date: Fri, 11 Nov 2022 05:30:54 +0000 Message-Id: <20221111053054.563891-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=-11.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_NUMSUBJECT,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP,URI_HEX autolearn=unavailable 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 x86_64-linux. Pushed to trunk. -- >8 -- This test fails if run with -std=gnu++14 because it should be using is_convertible instead of is_convertible_v. libstdc++-v3/ChangeLog: * testsuite/experimental/propagate_const/observers/107525.cc: Use type trait instead of C++17 variable template. --- .../experimental/propagate_const/observers/107525.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/testsuite/experimental/propagate_const/observers/107525.cc b/libstdc++-v3/testsuite/experimental/propagate_const/observers/107525.cc index e7ecff73c1a..37e970c3af4 100644 --- a/libstdc++-v3/testsuite/experimental/propagate_const/observers/107525.cc +++ b/libstdc++-v3/testsuite/experimental/propagate_const/observers/107525.cc @@ -32,10 +32,10 @@ test_const_conversion() operator const int*() const = delete; }; - static_assert(!std::is_convertible_v, + static_assert(!std::is_convertible::value, "Cannot convert const X to const int*"); // So should not be able to convert const propagate_const to const int*. - static_assert(!std::is_convertible_v, const int*>, + static_assert(!std::is_convertible, const int*>::value, "So should not be able to convert const propagate_const to " "const int* (although this is not what LFTSv3 says)"); } -- 2.38.1