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 D5E69383EC66 for ; Fri, 11 Nov 2022 05:31:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D5E69383EC66 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=1668144663; 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=RTi1ywGl/ly88nylri7MBWRLQlan8VZaoIvSKQHBVns=; b=JM1vs5s7kTGL6DBx9OOjUgBWmqNsh0W0RVELC4/dNPZwCSf/aP9tGa2/P0Od/vMDVfcn9c ifbtmcU84DyFr6C6dVPVU2JwbV11rzscVMz8ceINUs9p6HFaPL+b9tGGCcLmAtJNS3mgqv cLaIVYYzMp2NRvc209j5Vx2Yg3m7I1Y= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-213-DYtvPM8jNAORth7FR9N0CA-1; Fri, 11 Nov 2022 00:31:01 -0500 X-MC-Unique: DYtvPM8jNAORth7FR9N0CA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BE6E81C051A8; Fri, 11 Nov 2022 05:31:00 +0000 (UTC) Received: from localhost (unknown [10.33.36.199]) by smtp.corp.redhat.com (Postfix) with ESMTP id 87D42C19145; Fri, 11 Nov 2022 05:31:00 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Add missing definition for in C++14 mode Date: Fri, 11 Nov 2022 05:30:59 +0000 Message-Id: <20221111053059.563909-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.2 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,RCVD_IN_MSPIKE_H2,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 x86_64-linux. Pushed to trunk. -- >8 -- We support in C++14 as an extension, but that means that constexpr static data members are not implicitly inline. Add an out-of-class definition for C++14 mode. This fixes a FAIL when -std=gnu++14 is used: FAIL: 20_util/from_chars/1.cc (test for excess errors) libstdc++-v3/ChangeLog: * include/std/charconv (__from_chars_alnum_to_val_table::value): [!__cpp_inline_variables]: Add non-inline definition. --- libstdc++-v3/include/std/charconv | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libstdc++-v3/include/std/charconv b/libstdc++-v3/include/std/charconv index 09163af7fc9..acad865f8aa 100644 --- a/libstdc++-v3/include/std/charconv +++ b/libstdc++-v3/include/std/charconv @@ -444,6 +444,12 @@ namespace __detail static constexpr type value = (_DecOnly, _S_make_table()); }; +#if ! __cpp_inline_variables + template + const typename __from_chars_alnum_to_val_table<_DecOnly>::type + __from_chars_alnum_to_val_table<_DecOnly>::value; +#endif + // If _DecOnly is true: if the character is a decimal digit, then // return its corresponding base-10 value, otherwise return a value >= 127. // If _DecOnly is false: if the character is an alphanumeric digit, then -- 2.38.1