public inbox for libstdc++@gcc.gnu.org
 help / color / mirror / Atom feed
From: Jonathan Wakely <jwakely@redhat.com>
To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org
Cc: Michael Welsh Duggan <mwd@md5i.com>
Subject: [committed] libstdc++: Use constant for name of tzdata file
Date: Fri, 27 Jan 2023 15:45:29 +0000	[thread overview]
Message-ID: <20230127154529.1601707-1-jwakely@redhat.com> (raw)

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


                 reply	other threads:[~2023-01-27 15:45 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230127154529.1601707-1-jwakely@redhat.com \
    --to=jwakely@redhat.com \
    --cc=gcc-patches@gcc.gnu.org \
    --cc=libstdc++@gcc.gnu.org \
    --cc=mwd@md5i.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).