Skip to content

Commit b92f091

Browse files
timsong-cpptkoeppe
authored andcommitted
[time.syn][time.zone] Various editorial fixes (#2028)
1 parent 1f1b978 commit b92f091

File tree

1 file changed

+42
-30
lines changed

1 file changed

+42
-30
lines changed

source/utilities.tex

Lines changed: 42 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -18288,7 +18288,7 @@
1828818288
bool operator==(const zoned_time<Duration1, TimeZonePtr>& x,
1828918289
const zoned_time<Duration2, TimeZonePtr>& y);
1829018290

18291-
template<class Duration1, class Duration, class TimeZonePtr2>
18291+
template<class Duration1, class Duration2, class TimeZonePtr>
1829218292
bool operator!=(const zoned_time<Duration1, TimeZonePtr>& x,
1829318293
const zoned_time<Duration2, TimeZonePtr>& y);
1829418294

@@ -26040,7 +26040,7 @@
2604026040
for (hours h : {1h, 18h}) {
2604126041
time_of_day<hours> tod(h);
2604226042
os << tod << '\n';
26043-
tod.make12()
26043+
tod.make12();
2604426044
os << tod << '\n';
2604526045
}
2604626046
\end{codeblock}
@@ -26081,7 +26081,7 @@
2608126081
for (minutes m : {68min, 1095min}) {
2608226082
time_of_day<minutes> tod(m);
2608326083
os << tod << '\n';
26084-
tod.make12()
26084+
tod.make12();
2608526085
os << tod << '\n';
2608626086
}
2608726087
\end{codeblock}
@@ -26122,7 +26122,7 @@
2612226122
for (seconds s : {4083s, 65745s}) {
2612326123
time_of_day<seconds> tod(s);
2612426124
os << tod << '\n';
26125-
tod.make12()
26125+
tod.make12();
2612626126
os << tod << '\n';
2612726127
}
2612826128
\end{codeblock}
@@ -26163,7 +26163,7 @@
2616326163
for (milliseconds ms : {4083007ms, 65745123ms}) {
2616426164
time_of_day<seconds> tod(ms);
2616526165
os << tod << '\n';
26166-
tod.make12()
26166+
tod.make12();
2616726167
os << tod << '\n';
2616826168
}
2616926169
\end{codeblock}
@@ -27070,7 +27070,7 @@
2707027070
explicit zoned_time(string_view name);
2707127071

2707227072
template<class Duration2>
27073-
zoned_time(const zoned_time<Duration2>& zt) noexcept;
27073+
zoned_time(const zoned_time<Duration2, TimeZonePtr>& zt) noexcept;
2707427074

2707527075
zoned_time(TimeZonePtr z, const sys_time<Duration>& st);
2707627076
zoned_time(string_view name, const sys_time<Duration>& st);
@@ -27215,7 +27215,7 @@
2721527215
\end{itemdescr}
2721627216

2721727217
\begin{itemdecl}
27218-
template<class Duration2, TimeZonePtr2>
27218+
template<class Duration2>
2721927219
zoned_time(const zoned_time<Duration2, TimeZonePtr>& y) noexcept;
2722027220
\end{itemdecl}
2722127221

@@ -27272,7 +27272,7 @@
2727227272
\remarks
2727327273
This constructor does not participate in overload resolution unless
2727427274
\begin{codeblock}
27275-
declval<TimeZonePtr&>()->to_sys(local_time<Duration>{})
27275+
decltype(declval<TimeZonePtr&>()->to_sys(local_time<Duration>{}))
2727627276
\end{codeblock}
2727727277
is convertible to \tcode{sys_time<duration>}.
2727827278

@@ -27336,7 +27336,7 @@
2733627336
\end{itemdescr}
2733727337

2733827338
\begin{itemdecl}
27339-
template<class Duration2, TimeZonePtr2>
27339+
template<class Duration2, class TimeZonePtr2>
2734027340
zoned_time(TimeZonePtr z, const zoned_time<Duration2, TimeZonePtr2>& y);
2734127341
\end{itemdecl}
2734227342

@@ -27355,7 +27355,7 @@
2735527355
\end{itemdescr}
2735627356

2735727357
\begin{itemdecl}
27358-
template<class Duration2, TimeZonePtr2>
27358+
template<class Duration2, class TimeZonePtr2>
2735927359
zoned_time(TimeZonePtr z, const zoned_time<Duration2, TimeZonePtr2>& y, choose);
2736027360
\end{itemdecl}
2736127361

@@ -27521,12 +27521,24 @@
2752127521
\returns \tcode{x.zone_ == y.zone_ \&\& x.tp_ == y.tp_}.
2752227522
\end{itemdescr}
2752327523

27524+
\indexlibrarymember{operator"!=}{zoned_time}%
27525+
\begin{itemdecl}
27526+
template<class Duration1, class Duration2, class TimeZonePtr>
27527+
bool operator!=(const zoned_time<Duration1, TimeZonePtr>& x,
27528+
const zoned_time<Duration2, TimeZonePtr>& y);
27529+
\end{itemdecl}
27530+
27531+
\begin{itemdescr}
27532+
\pnum
27533+
\returns \tcode{!(x == y)}.
27534+
\end{itemdescr}
27535+
2752427536
\indexlibrarymember{operator<<}{zoned_time}%
2752527537
\begin{itemdecl}
2752627538
template<class charT, class traits, class Duration, class TimeZonePtr>
2752727539
basic_ostream<charT, traits>&
2752827540
operator<<(basic_ostream<charT, traits>& os,
27529-
const zoned_time<Duration, TimeZonePtr>& t)
27541+
const zoned_time<Duration, TimeZonePtr>& t);
2753027542
\end{itemdecl}
2753127543

2753227544
\begin{itemdescr}
@@ -27629,7 +27641,7 @@
2762927641

2763027642
\indexlibrarymember{date}{leap}%
2763127643
\begin{itemdecl}
27632-
constexpr sys_seconds date() const noexcept
27644+
constexpr sys_seconds date() const noexcept;
2763327645
\end{itemdecl}
2763427646

2763527647
\begin{itemdescr}
@@ -27641,7 +27653,7 @@
2764127653

2764227654
\indexlibrarymember{operator==}{leap}%
2764327655
\begin{itemdecl}
27644-
constexpr bool operator==(const leap& x, const leap& y) noexcept
27656+
constexpr bool operator==(const leap& x, const leap& y) noexcept;
2764527657
\end{itemdecl}
2764627658

2764727659
\begin{itemdescr}
@@ -27651,7 +27663,7 @@
2765127663

2765227664
\indexlibrarymember{operator<}{leap}%
2765327665
\begin{itemdecl}
27654-
constexpr bool operator<(const leap& x, const leap& y) noexcept
27666+
constexpr bool operator<(const leap& x, const leap& y) noexcept;
2765527667
\end{itemdecl}
2765627668

2765727669
\begin{itemdescr}
@@ -27663,7 +27675,7 @@
2766327675
\indexlibrarymember{operator==}{sys_time}%
2766427676
\begin{itemdecl}
2766527677
template<class Duration>
27666-
constexpr bool operator==(const leap& x, const sys_time<Duration>& y) noexcept
27678+
constexpr bool operator==(const leap& x, const sys_time<Duration>& y) noexcept;
2766727679
\end{itemdecl}
2766827680

2766927681
\begin{itemdescr}
@@ -27675,7 +27687,7 @@
2767527687
\indexlibrarymember{operator==}{sys_time}%
2767627688
\begin{itemdecl}
2767727689
template<class Duration>
27678-
constexpr bool operator==(const sys_time<Duration>& x, const leap& y) noexcept
27690+
constexpr bool operator==(const sys_time<Duration>& x, const leap& y) noexcept;
2767927691
\end{itemdecl}
2768027692

2768127693
\begin{itemdescr}
@@ -27687,7 +27699,7 @@
2768727699
\indexlibrarymember{operator"!=}{sys_time}%
2768827700
\begin{itemdecl}
2768927701
template<class Duration>
27690-
constexpr bool operator!=(const leap& x, const sys_time<Duration>& y) noexcept
27702+
constexpr bool operator!=(const leap& x, const sys_time<Duration>& y) noexcept;
2769127703
\end{itemdecl}
2769227704

2769327705
\begin{itemdescr}
@@ -27699,7 +27711,7 @@
2769927711
\indexlibrarymember{operator"!=}{sys_time}%
2770027712
\begin{itemdecl}
2770127713
template<class Duration>
27702-
constexpr bool operator!=(const sys_time<Duration>& x, const leap& y) noexcept
27714+
constexpr bool operator!=(const sys_time<Duration>& x, const leap& y) noexcept;
2770327715
\end{itemdecl}
2770427716

2770527717
\begin{itemdescr}
@@ -27711,7 +27723,7 @@
2771127723
\indexlibrarymember{operator<}{sys_time}%
2771227724
\begin{itemdecl}
2771327725
template<class Duration>
27714-
constexpr bool operator<(const leap& x, const sys_time<Duration>& y) noexcept
27726+
constexpr bool operator<(const leap& x, const sys_time<Duration>& y) noexcept;
2771527727
\end{itemdecl}
2771627728

2771727729
\begin{itemdescr}
@@ -27723,7 +27735,7 @@
2772327735
\indexlibrarymember{operator<}{sys_time}%
2772427736
\begin{itemdecl}
2772527737
template<class Duration>
27726-
constexpr bool operator<(const sys_time<Duration>& x, const leap& y) noexcept
27738+
constexpr bool operator<(const sys_time<Duration>& x, const leap& y) noexcept;
2772727739
\end{itemdecl}
2772827740

2772927741
\begin{itemdescr}
@@ -27735,7 +27747,7 @@
2773527747
\indexlibrarymember{operator>}{sys_time}%
2773627748
\begin{itemdecl}
2773727749
template<class Duration>
27738-
constexpr bool operator>(const leap& x, const sys_time<Duration>& y) noexcept
27750+
constexpr bool operator>(const leap& x, const sys_time<Duration>& y) noexcept;
2773927751
\end{itemdecl}
2774027752

2774127753
\begin{itemdescr}
@@ -27747,7 +27759,7 @@
2774727759
\indexlibrarymember{operator>}{sys_time}%
2774827760
\begin{itemdecl}
2774927761
template<class Duration>
27750-
constexpr bool operator>(const sys_time<Duration>& x, const leap& y) noexcept
27762+
constexpr bool operator>(const sys_time<Duration>& x, const leap& y) noexcept;
2775127763
\end{itemdecl}
2775227764

2775327765
\begin{itemdescr}
@@ -27759,7 +27771,7 @@
2775927771
\indexlibrarymember{operator<=}{sys_time}%
2776027772
\begin{itemdecl}
2776127773
template<class Duration>
27762-
constexpr bool operator<=(const leap& x, const sys_time<Duration>& y) noexcept
27774+
constexpr bool operator<=(const leap& x, const sys_time<Duration>& y) noexcept;
2776327775
\end{itemdecl}
2776427776

2776527777
\begin{itemdescr}
@@ -27771,7 +27783,7 @@
2777127783
\indexlibrarymember{operator<=}{sys_time}%
2777227784
\begin{itemdecl}
2777327785
template<class Duration>
27774-
constexpr bool operator<=(const sys_time<Duration>& x, const leap& y) noexcept
27786+
constexpr bool operator<=(const sys_time<Duration>& x, const leap& y) noexcept;
2777527787
\end{itemdecl}
2777627788

2777727789
\begin{itemdescr}
@@ -27783,7 +27795,7 @@
2778327795
\indexlibrarymember{operator>=}{sys_time}%
2778427796
\begin{itemdecl}
2778527797
template<class Duration>
27786-
constexpr bool operator>=(const leap& x, const sys_time<Duration>& y) noexcept
27798+
constexpr bool operator>=(const leap& x, const sys_time<Duration>& y) noexcept;
2778727799
\end{itemdecl}
2778827800

2778927801
\begin{itemdescr}
@@ -27795,7 +27807,7 @@
2779527807
\indexlibrarymember{operator>=}{sys_time}%
2779627808
\begin{itemdecl}
2779727809
template<class Duration>
27798-
constexpr bool operator>=(const sys_time<Duration>& x, const leap& y) noexcept
27810+
constexpr bool operator>=(const sys_time<Duration>& x, const leap& y) noexcept;
2779927811
\end{itemdecl}
2780027812

2780127813
\begin{itemdescr}
@@ -27831,7 +27843,7 @@
2783127843

2783227844
\indexlibrarymember{name}{link}%
2783327845
\begin{itemdecl}
27834-
string_view name() const noexcept
27846+
string_view name() const noexcept;
2783527847
\end{itemdecl}
2783627848

2783727849
\begin{itemdescr}
@@ -27842,7 +27854,7 @@
2784227854

2784327855
\indexlibrarymember{target}{link}%
2784427856
\begin{itemdecl}
27845-
string_view target() const noexcept
27857+
string_view target() const noexcept;
2784627858
\end{itemdecl}
2784727859

2784827860
\begin{itemdescr}
@@ -27856,7 +27868,7 @@
2785627868

2785727869
\indexlibrarymember{operator==}{link}%
2785827870
\begin{itemdecl}
27859-
bool operator==(const link& x, const link& y) noexcept
27871+
bool operator==(const link& x, const link& y) noexcept;
2786027872
\end{itemdecl}
2786127873

2786227874
\begin{itemdescr}
@@ -27866,7 +27878,7 @@
2786627878

2786727879
\indexlibrarymember{operator<}{link}%
2786827880
\begin{itemdecl}
27869-
bool operator<(const link& x, const link& y) noexcept
27881+
bool operator<(const link& x, const link& y) noexcept;
2787027882
\end{itemdecl}
2787127883

2787227884
\begin{itemdescr}

0 commit comments

Comments
 (0)