* [committed] libstdc++: Support single components in name of chrono::current_zone() [PR108211]
@ 2023-01-05 0:53 Jonathan Wakely
0 siblings, 0 replies; only message in thread
From: Jonathan Wakely @ 2023-01-05 0:53 UTC (permalink / raw)
To: libstdc++, gcc-patches
Tested x86_64-linux. Pushed to trunk.
-- >8 --
We currently only handle the case where /etc/localtime is a symlink to a
path like ".../Etc/UTC" and fail for ".../UTC". This makes both work.
libstdc++-v3/ChangeLog:
PR libstdc++/108211
* src/c++20/tzdb.cc (chrono::current_zone()): Check for zone
using only last component of the name.
---
libstdc++-v3/src/c++20/tzdb.cc | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/libstdc++-v3/src/c++20/tzdb.cc b/libstdc++-v3/src/c++20/tzdb.cc
index 6772517d55a..9103b159400 100644
--- a/libstdc++-v3/src/c++20/tzdb.cc
+++ b/libstdc++-v3/src/c++20/tzdb.cc
@@ -1501,8 +1501,11 @@ namespace std::chrono
if (std::distance(first, last) > 2)
{
--last;
- string name = std::prev(last)->string() + '/';
- name += last->string();
+ string name = last->string();
+ if (auto tz = do_locate_zone(this->zones, this->links, name))
+ return tz;
+ --last;
+ name = last->string() + '/' + name;
if (auto tz = do_locate_zone(this->zones, this->links, name))
return tz;
}
--
2.39.0
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-01-05 0:53 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-05 0:53 [committed] libstdc++: Support single components in name of chrono::current_zone() [PR108211] Jonathan Wakely
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).