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 1F5ED3857C51 for ; Fri, 27 Jan 2023 15:45:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1F5ED3857C51 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=1674834334; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w7vI6tJsstLt+n2aqpmuRDal/iEzQwbnjjYFlpv41aA=; b=BkyJEcaL2xO2RjmLtfd2a/GBF6vuCh8azSYFHjCffq4tlrrThO8Ppu+oORRll/pWp5oeJj z4G9TcR0YJH8JdXRecdIP+7laiRfTRPHMOhJGA5RrvDF7wWtLHdZDnl5yx8jtqIJd3jsUk BXY25nA6+VVNcTpy+pFcw63kYCuFzM8= 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-510-uO81rJi0NCS3cmUPLKLVWA-1; Fri, 27 Jan 2023 10:45:32 -0500 X-MC-Unique: uO81rJi0NCS3cmUPLKLVWA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 922F83814958; Fri, 27 Jan 2023 15:45:30 +0000 (UTC) Received: from localhost (unknown [10.33.36.186]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5057018EC1; Fri, 27 Jan 2023 15:45:30 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Cc: Michael Welsh Duggan Subject: [committed] libstdc++: Use constant for name of tzdata file Date: Fri, 27 Jan 2023 15:45:29 +0000 Message-Id: <20230127154529.1601707-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-13.5 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: Thanks to Michael Welsh Duggan for pointing this out. Tested x86_64-linux. Pushed to trunk. -- >8 -- There's a string_view with this filename, which should have been used instead of a string literal. libstdc++-v3/ChangeLog: * src/c++20/tzdb.cc (tzdata_stream): Use constant instead of string literal. --- libstdc++-v3/src/c++20/tzdb.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libstdc++-v3/src/c++20/tzdb.cc b/libstdc++-v3/src/c++20/tzdb.cc index c956e861891..2e7e173f0ef 100644 --- a/libstdc++-v3/src/c++20/tzdb.cc +++ b/libstdc++-v3/src/c++20/tzdb.cc @@ -1106,7 +1106,7 @@ namespace std::chrono tzdata_stream() : istream(nullptr) { - if (string path = zoneinfo_file("/tzdata.zi"); !path.empty()) + if (string path = zoneinfo_file(tzdata_file); !path.empty()) { filebuf fbuf; if (fbuf.open(path, std::ios::in)) -- 2.39.1