aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2023-08-17 20:39:02 +0100
committerJonathan Wakely <jwakely@redhat.com>2023-08-17 20:42:35 +0100
commitd82a85b6161cbeebfe3de5d3d4cdd355e4617e69 (patch)
treefafda9687e0d7125fc2d64838fa870cc7fbc3f49
parentaad83d61d2e92b168688f7b6bd00b8604d11fc9f (diff)
downloadgcc-d82a85b6161cbeebfe3de5d3d4cdd355e4617e69.zip
gcc-d82a85b6161cbeebfe3de5d3d4cdd355e4617e69.tar.gz
gcc-d82a85b6161cbeebfe3de5d3d4cdd355e4617e69.tar.bz2
libstdc++: Replace global std::string objects in tzdb.cc
When the library is built with --disable-libstdcxx-dual-abi the only type of std::string supported is the COW string, and the two global std::string objects in tzdb.cc have to allocate memory. I added them thinking they would fit in the SSO string buffer, but that's not the case when the library only uses COW strings. Replace them with string_view objects to avoid any allocations. libstdc++-v3/ChangeLog: * src/c++20/tzdb.cc (tzdata_file, leaps_file): Change type to std::string_view.
-rw-r--r--libstdc++-v3/src/c++20/tzdb.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/libstdc++-v3/src/c++20/tzdb.cc b/libstdc++-v3/src/c++20/tzdb.cc
index 8d27726..0fcbf6a 100644
--- a/libstdc++-v3/src/c++20/tzdb.cc
+++ b/libstdc++-v3/src/c++20/tzdb.cc
@@ -1078,8 +1078,8 @@ namespace std::chrono
}
// N.B. Leading slash as required by zoneinfo_file function.
- const string tzdata_file = "/tzdata.zi";
- const string leaps_file = "/leapseconds";
+ const string_view tzdata_file = "/tzdata.zi";
+ const string_view leaps_file = "/leapseconds";
#ifdef _GLIBCXX_STATIC_TZDATA
// Static copy of tzdata.zi embedded in the library as tzdata_chars[]