From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 69610385B50F; Fri, 27 Jan 2023 15:43:37 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 69610385B50F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1674834217; bh=NjMapD7EclwAtLR+SDyVIYYCWAbrQAMI53M3er/PyuQ=; h=From:To:Subject:Date:From; b=HBXNGh9QIOxDeBL1U+KCrVqLthnaU9mwxpb9FtBscvWuCTHkBnJ/n9w+EAMIdLjjw YyqsYX8hztqAyXZGsVkYTWnvGPcYIVI4OC06PWhs9lf7y7U0581yxgGWJX6jQK4IVW gE2YOIIQtNACBs+ZVBEQlLkIJtQVQfHYUXaTQ/Yc= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r13-5455] libstdc++: Use constant for name of tzdata file X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 3adf6dd508491d26e21840a8a70b016f876edd53 X-Git-Newrev: def6e12e3488557dde9665db620ca53f9424713e Message-Id: <20230127154337.69610385B50F@sourceware.org> Date: Fri, 27 Jan 2023 15:43:37 +0000 (GMT) List-Id: https://gcc.gnu.org/g:def6e12e3488557dde9665db620ca53f9424713e commit r13-5455-gdef6e12e3488557dde9665db620ca53f9424713e Author: Jonathan Wakely Date: Fri Jan 27 11:29:21 2023 +0000 libstdc++: Use constant for name of tzdata file 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. Diff: --- 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))