diff options
| author | Nikolas Klauser <nikolasklauser@berlin.de> | 2024-04-22 22:13:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-22 22:13:58 +0200 |
| commit | 83bc7b57714dc2f6b33c188f2b95a0025468ba51 (patch) | |
| tree | 5cb65899bda2744fc8b7c59a2afb7650db550401 /libcxx/src | |
| parent | 7c5854673391940d578c591c727614bf50b78301 (diff) | |
| download | llvm-83bc7b57714dc2f6b33c188f2b95a0025468ba51.zip llvm-83bc7b57714dc2f6b33c188f2b95a0025468ba51.tar.gz llvm-83bc7b57714dc2f6b33c188f2b95a0025468ba51.tar.bz2 | |
[libc++] Remove _LIBCPP_DISABLE_NODISCARD_EXTENSIONS and refactor the tests (#87094)
This also adds a few tests that were missing.
Diffstat (limited to 'libcxx/src')
| -rw-r--r-- | libcxx/src/tzdb.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/src/tzdb.cpp b/libcxx/src/tzdb.cpp index d521d81..5951e59 100644 --- a/libcxx/src/tzdb.cpp +++ b/libcxx/src/tzdb.cpp @@ -732,7 +732,7 @@ void __init_tzdb(tzdb& __tzdb, __tz::__rules_storage_type& __rules) { // Public API //===----------------------------------------------------------------------===// -_LIBCPP_NODISCARD_EXT _LIBCPP_AVAILABILITY_TZDB _LIBCPP_EXPORTED_FROM_ABI tzdb_list& get_tzdb_list() { +_LIBCPP_AVAILABILITY_TZDB _LIBCPP_EXPORTED_FROM_ABI tzdb_list& get_tzdb_list() { static tzdb_list __result{new tzdb_list::__impl()}; return __result; } @@ -752,7 +752,7 @@ _LIBCPP_AVAILABILITY_TZDB _LIBCPP_EXPORTED_FROM_ABI const tzdb& reload_tzdb() { return chrono::get_tzdb_list().__implementation().__load(); } -_LIBCPP_NODISCARD_EXT _LIBCPP_AVAILABILITY_TZDB _LIBCPP_EXPORTED_FROM_ABI string remote_version() { +_LIBCPP_AVAILABILITY_TZDB _LIBCPP_EXPORTED_FROM_ABI string remote_version() { filesystem::path __root = chrono::__libcpp_tzdb_directory(); ifstream __tzdata{__root / "tzdata.zi"}; return chrono::__parse_version(__tzdata); |