From patchwork Mon Oct 14 15:50:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 1997051 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=gUUEO230; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.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 ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XS1tY5gX6z1xvm for ; Tue, 15 Oct 2024 02:51:33 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id F2D78385AE4E for ; Mon, 14 Oct 2024 15:51:31 +0000 (GMT) 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 44B56385AE57 for ; Mon, 14 Oct 2024 15:50:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 44B56385AE57 Authentication-Results: sourceware.org; dmarc=pass (p=none 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 44B56385AE57 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=1728921065; cv=none; b=tZOBwsyfNWssl6gsw8/2np/S87cKqu2W8fvuW6vTDg122mEdwShUGtQAuMnTxlnxSPj6qdIRvoRjbuxaGtTfAeTxnp20oxxw6JqlwWqX/mxqOieqtgDzxWkpdF7hnIdYcDyXDgPBGD8zvlVEiEMQvKcEUtxDgEmy353Pz2mWf7c= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728921065; c=relaxed/simple; bh=6LXoD0sLWJaH/UIsUtowyWloZpJSe5SxYPYU2VjSHMA=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=o0ps2k/yHtnAA1Wa028c1UFInOjnMKyGwAvaH7SXx4b10ZAWLQJyucRPXn4rEQHcIG6jVnDsq2R3O2GSkvAMZzCD0pV6LBYpK1k4wTExk4eGC0dKN1niBI2nIpsbEpYnTXLK8i1un/LObdQFkFuuPFtJhz2tIfkDlXZPP08mA8I= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1728921057; 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=kZQzzijzMxDc0a1s10VlrY6nmXK3oCpSqSVpj/SPcoc=; b=gUUEO230UxsNgBkUteAoI9aoH7Pe+R02IxRzLDFofqZFx4KQbOaiSBLWacbyxFIvAp7KJd L7mCEyrxrnOE9IRo42hFy2liSbrHA2Dt2mU5+gKleOcsAEjGXBZEviG92/zFqpvVxBIg8c 5jS/bTJWEr6ztXdUNgsEf/dVtdPnYUg= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-397-z_8eLlZnOyuVW5AK5xeZmg-1; Mon, 14 Oct 2024 11:50:53 -0400 X-MC-Unique: z_8eLlZnOyuVW5AK5xeZmg-1 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3BF721955F3F; Mon, 14 Oct 2024 15:50:51 +0000 (UTC) Received: from localhost (unknown [10.42.28.16]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 84C3319560A2; Mon, 14 Oct 2024 15:50:49 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Populate generic std::time_get's wide %c format [PR117135] Date: Mon, 14 Oct 2024 16:50:35 +0100 Message-ID: <20241014155048.1901655-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-10.4 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_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SBL_CSS, 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~incoming=patchwork.ozlabs.org@gcc.gnu.org Tested x86_64-linux. Pushed to trunk. -- >8 -- I missed out the __timepunct specialization for the "generic" implementation when defining the %c format in r15-4016-gc534e37faccf48. libstdc++-v3/ChangeLog: PR libstdc++/117135 * config/locale/generic/time_members.cc (__timepunct::_M_initialize_timepunc): Set _M_date_time_format for C locale. Set %Ex formats to the same values as the %x formats. --- libstdc++-v3/config/locale/generic/time_members.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/config/locale/generic/time_members.cc b/libstdc++-v3/config/locale/generic/time_members.cc index 6619f0ca881..5012a270dd1 100644 --- a/libstdc++-v3/config/locale/generic/time_members.cc +++ b/libstdc++-v3/config/locale/generic/time_members.cc @@ -150,11 +150,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_data = new __timepunct_cache; _M_data->_M_date_format = L"%m/%d/%y"; - _M_data->_M_date_era_format = L"%m/%d/%y"; + _M_data->_M_date_era_format = _M_data->_M_date_format; _M_data->_M_time_format = L"%H:%M:%S"; - _M_data->_M_time_era_format = L"%H:%M:%S"; - _M_data->_M_date_time_format = L""; - _M_data->_M_date_time_era_format = L""; + _M_data->_M_time_era_format = _M_data->_M_time_format; + _M_data->_M_date_time_format = L"%a %b %e %T %Y"; + _M_data->_M_date_time_era_format = _M_data->_M_date_time_format; _M_data->_M_am = L"AM"; _M_data->_M_pm = L"PM"; _M_data->_M_am_pm_format = L"%I:%M:%S %p";