Skip to content

Commit b510fb2

Browse files
committed
Revert "[libc++][TZDB] Implements zoned_traits. (llvm#91059)"
This reverts commit 151bd7c.
1 parent 1fe4f2d commit b510fb2

File tree

9 files changed

+2
-182
lines changed

9 files changed

+2
-182
lines changed

libcxx/include/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,6 @@ set(files
277277
__chrono/year_month.h
278278
__chrono/year_month_day.h
279279
__chrono/year_month_weekday.h
280-
__chrono/zoned_time.h
281280
__compare/common_comparison_category.h
282281
__compare/compare_partial_order_fallback.h
283282
__compare/compare_strong_order_fallback.h

libcxx/include/__chrono/zoned_time.h

Lines changed: 0 additions & 55 deletions
This file was deleted.

libcxx/include/chrono

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -786,9 +786,6 @@ class time_zone {
786786
bool operator==(const time_zone& x, const time_zone& y) noexcept; // C++20
787787
strong_ordering operator<=>(const time_zone& x, const time_zone& y) noexcept; // C++20
788788
789-
// [time.zone.zonedtraits], class template zoned_traits
790-
template<class T> struct zoned_traits; // C++20
791-
792789
// [time.zone.leap], leap second support
793790
class leap_second { // C++20
794791
public:
@@ -962,7 +959,6 @@ constexpr chrono::year operator ""y(unsigned lo
962959
# include <__chrono/time_zone_link.h>
963960
# include <__chrono/tzdb.h>
964961
# include <__chrono/tzdb_list.h>
965-
# include <__chrono/zoned_time.h>
966962
# endif
967963

968964
#endif

libcxx/include/module.modulemap

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1159,7 +1159,6 @@ module std_private_chrono_year [system] { header "__chrono/yea
11591159
module std_private_chrono_year_month [system] { header "__chrono/year_month.h" }
11601160
module std_private_chrono_year_month_day [system] { header "__chrono/year_month_day.h" }
11611161
module std_private_chrono_year_month_weekday [system] { header "__chrono/year_month_weekday.h" }
1162-
module std_private_chrono_zoned_time [system] { header "__chrono/zoned_time.h" }
11631162

11641163
module std_private_compare_common_comparison_category [system] { header "__compare/common_comparison_category.h" }
11651164
module std_private_compare_compare_partial_order_fallback [system] { header "__compare/compare_partial_order_fallback.h" }

libcxx/modules/std/chrono.inc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,10 +227,11 @@ export namespace std {
227227
using std::chrono::choose;
228228
using std::chrono::time_zone;
229229

230+
# if 0
231+
230232
// [time.zone.zonedtraits], class template zoned_traits
231233
using std::chrono::zoned_traits;
232234

233-
# if 0
234235
// [time.zone.zonedtime], class template zoned_time
235236
using std::chrono::zoned_time;
236237

libcxx/test/libcxx/diagnostics/chrono.nodiscard.verify.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,4 @@ void test() {
7272
leap.date(); // expected-warning {{ignoring return value of function declared with 'nodiscard' attribute}}
7373
leap.value(); // expected-warning {{ignoring return value of function declared with 'nodiscard' attribute}}
7474
}
75-
76-
{
77-
using t = std::chrono::zoned_traits<const std::chrono::time_zone*>;
78-
t::default_zone(); // expected-warning {{ignoring return value of function declared with 'nodiscard' attribute}}
79-
t::locate_zone(""); // expected-warning {{ignoring return value of function declared with 'nodiscard' attribute}}
80-
}
8175
}

libcxx/test/std/time/time.zone/time.zone.zonedtraits/const_time_zone_default_zone.pass.cpp

Lines changed: 0 additions & 36 deletions
This file was deleted.

libcxx/test/std/time/time.zone/time.zone.zonedtraits/const_time_zone_locate_zone.pass.cpp

Lines changed: 0 additions & 45 deletions
This file was deleted.

libcxx/test/std/time/time.zone/time.zone.zonedtraits/types.compile.pass.cpp

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)