Skip to content

Commit 2b1b4e3

Browse files
authored
[libc++][TZDB] Implements zoned_time's operator==. (llvm#95140)
Implements parts of: - P0355 Extending to chrono Calendars and Time Zones - P1614R2 The Mothership has Landed
1 parent ad01635 commit 2b1b4e3

File tree

4 files changed

+81
-2
lines changed

4 files changed

+81
-2
lines changed

libcxx/docs/Status/SpaceshipProjects.csv

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ Section,Description,Dependencies,Assignee,Complete
140140
"| `[class.slice.overview] <https://wg21.link/class.slice.overview>`_
141141
| `[slice.ops] <https://wg21.link/slice.ops>`_",| `slice <https://reviews.llvm.org/D152617>`_,None,Hristo Hristov,|Complete|
142142
- `5.12 Clause 27: Time library <https://wg21.link/p1614r2#clause-27-time-library>`_,,,,
143-
| `[time.syn] <https://wg21.link/time.syn>`_,|,None,Mark de Wever,|In Progress|
143+
| `[time.syn] <https://wg21.link/time.syn>`_,|,None,Mark de Wever,|Complete|
144144
| `[time.duration.comparisons] <https://wg21.link/time.duration.comparisons>`_, `chrono::duration <https://reviews.llvm.org/D145881>`_, None, Hristo Hristov, |Complete|
145145
| `[time.point.comparisons] <https://wg21.link/time.point.comparisons>`_, `chrono::time_point <https://reviews.llvm.org/D146250>`_, None, Hristo Hristov, |Complete|
146146
"| `[time.cal.day.nonmembers] <https://wg21.link/time.cal.day.nonmembers>`_
@@ -172,7 +172,7 @@ Section,Description,Dependencies,Assignee,Complete
172172
| `year_month_weekday <https://reviews.llvm.org/D152699>`_
173173
| `year_month_weekday_last <https://reviews.llvm.org/D152699>`_",None,Hristo Hristov,|Complete|
174174
`[time.zone.nonmembers] <https://wg21.link/time.zone.nonmembers>`_,"`chrono::time_zone`",,Mark de Wever,|Complete|
175-
`[time.zone.zonedtime.nonmembers] <https://wg21.link/time.zone.zonedtime.nonmembers>`_,"`chrono::zoned_time`",A ``<chrono>`` implementation,Mark de Wever,|In Progress|
175+
`[time.zone.zonedtime.nonmembers] <https://wg21.link/time.zone.zonedtime.nonmembers>`_,"`chrono::zoned_time`",,Mark de Wever,|Complete|
176176
`[time.zone.leap.nonmembers] <https://wg21.link/time.zone.leap.nonmembers>`_,"`chrono::time_leap_seconds`",,Mark de Wever,|Complete|
177177
`[time.zone.link.nonmembers] <https://wg21.link/time.zone.link.nonmembers>`_,"`chrono::time_zone_link`",,Mark de Wever,|Complete|
178178
- `5.13 Clause 28: Localization library <https://wg21.link/p1614r2#clause-28-localization-library>`_,,,,

libcxx/include/__chrono/zoned_time.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,12 @@ template <class _Duration, class _TimeZonePtrOrName, class TimeZonePtr2>
205205
zoned_time(_TimeZonePtrOrName&&, zoned_time<_Duration, TimeZonePtr2>, choose = choose::earliest)
206206
-> zoned_time<common_type_t<_Duration, seconds>, __time_zone_representation<_TimeZonePtrOrName>>;
207207

208+
template <class _Duration1, class _Duration2, class _TimeZonePtr>
209+
_LIBCPP_HIDE_FROM_ABI bool
210+
operator==(const zoned_time<_Duration1, _TimeZonePtr>& __lhs, const zoned_time<_Duration2, _TimeZonePtr>& __rhs) {
211+
return __lhs.get_time_zone() == __rhs.get_time_zone() && __lhs.get_sys_time() == __rhs.get_sys_time();
212+
}
213+
208214
} // namespace chrono
209215

210216
# endif // _LIBCPP_STD_VER >= 20 && !defined(_LIBCPP_HAS_NO_TIME_ZONE_DATABASE) && !defined(_LIBCPP_HAS_NO_FILESYSTEM)

libcxx/include/chrono

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -793,6 +793,10 @@ template<class T> struct zoned_traits;
793793
template<class Duration, class TimeZonePtr = const time_zone*> // C++20
794794
class zoned_time;
795795
796+
template<class Duration1, class Duration2, class TimeZonePtr> // C++20
797+
bool operator==(const zoned_time<Duration1, TimeZonePtr>& x,
798+
const zoned_time<Duration2, TimeZonePtr>& y);
799+
796800
// [time.zone.leap], leap second support
797801
class leap_second { // C++20
798802
public:
Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
//===----------------------------------------------------------------------===//
2+
//
3+
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4+
// See https://llvm.org/LICENSE.txt for license information.
5+
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6+
//
7+
//===----------------------------------------------------------------------===//
8+
9+
// UNSUPPORTED: c++03, c++11, c++14, c++17
10+
// UNSUPPORTED: no-filesystem, no-localization, no-tzdb
11+
12+
// XFAIL: libcpp-has-no-experimental-tzdb
13+
// XFAIL: availability-tzdb-missing
14+
15+
// <chrono>
16+
17+
// template<class Duration1, class Duration2, class TimeZonePtr>
18+
// bool operator==(const zoned_time<Duration1, TimeZonePtr>& x,
19+
// const zoned_time<Duration2, TimeZonePtr>& y);
20+
//
21+
// Note operator!= is generated by the compiler
22+
23+
#include <chrono>
24+
25+
#include "test_comparisons.h"
26+
27+
int main(int, char**) {
28+
{
29+
std::chrono::zoned_time zt;
30+
assert(testEquality(zt, zt, true));
31+
}
32+
{
33+
std::chrono::zoned_time lhs{"UTC"};
34+
std::chrono::zoned_time rhs{"Europe/Berlin"};
35+
assert(testEquality(lhs, rhs, false));
36+
}
37+
{
38+
std::chrono::zoned_time lhs{"UTC", std::chrono::sys_time<std::chrono::seconds>{std::chrono::seconds{123}}};
39+
40+
assert(testEquality(lhs,
41+
std::chrono::zoned_time{
42+
std::chrono::sys_time<std::chrono::nanoseconds>{std::chrono::nanoseconds{123'000'000'000}}},
43+
true));
44+
assert(testEquality(lhs,
45+
std::chrono::zoned_time{
46+
std::chrono::sys_time<std::chrono::nanoseconds>{std::chrono::nanoseconds{123'000'000'001}}},
47+
false));
48+
49+
assert(testEquality(lhs,
50+
std::chrono::zoned_time{
51+
std::chrono::sys_time<std::chrono::microseconds>{std::chrono::microseconds{123'000'000}}},
52+
true));
53+
assert(testEquality(lhs,
54+
std::chrono::zoned_time{
55+
std::chrono::sys_time<std::chrono::microseconds>{std::chrono::microseconds{123'000'001}}},
56+
false));
57+
58+
assert(testEquality(
59+
lhs,
60+
std::chrono::zoned_time{std::chrono::sys_time<std::chrono::milliseconds>{std::chrono::milliseconds{123'000}}},
61+
true));
62+
assert(testEquality(
63+
lhs,
64+
std::chrono::zoned_time{std::chrono::sys_time<std::chrono::milliseconds>{std::chrono::milliseconds{123'001}}},
65+
false));
66+
}
67+
68+
return 0;
69+
}

0 commit comments

Comments
 (0)