From 2cd781163c2084e27e0b7bf32c8134bc09544ee5 Mon Sep 17 00:00:00 2001 From: Casey Carter Date: Wed, 25 Mar 2020 11:26:36 -0700 Subject: [PATCH 1/5] [iterator.synopsis,move.iter.nonmember] Harmoize formatting of operator-(move_iterator, move_iterator) --- source/iterators.tex | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/source/iterators.tex b/source/iterators.tex index 447e40678b..e5837e4e4d 100644 --- a/source/iterators.tex +++ b/source/iterators.tex @@ -356,8 +356,8 @@ template constexpr auto operator-( - const move_iterator& x, - const move_iterator& y) -> decltype(x.base() - y.base()); + const move_iterator& x, const move_iterator& y) + -> decltype(x.base() - y.base()); template constexpr move_iterator operator+(iter_difference_t n, const move_iterator& x); @@ -4483,9 +4483,9 @@ \indexlibrarymember{operator-}{move_iterator}% \begin{itemdecl} template - constexpr auto operator-(const move_iterator& x, - const move_iterator& y) - -> decltype(x.base() - y.base()); + constexpr auto operator-( + const move_iterator& x, const move_iterator& y) + -> decltype(x.base() - y.base()); template<@\libconcept{sized_sentinel_for}@ S> friend constexpr iter_difference_t operator-(const move_sentinel& x, const move_iterator& y); From cd8102cd2b9fb1e0299f4c6c99ba51f777e0ced4 Mon Sep 17 00:00:00 2001 From: Alberto Barbati <2210776+iaanus@users.noreply.github.com> Date: Thu, 23 Apr 2020 20:39:19 +0200 Subject: [PATCH 2/5] [format.syn] Add missing reference to [format.context] in header synopsis (#3954) --- source/utilities.tex | 1 + 1 file changed, 1 insertion(+) diff --git a/source/utilities.tex b/source/utilities.tex index ee90c6fbf0..1620986a3d 100644 --- a/source/utilities.tex +++ b/source/utilities.tex @@ -19183,6 +19183,7 @@ using format_parse_context = basic_format_parse_context; using wformat_parse_context = basic_format_parse_context; + // \ref{format.context}, class template \tcode{basic_format_context} template class basic_format_context; using format_context = basic_format_context<@\unspec@, char>; using wformat_context = basic_format_context<@\unspec@, wchar_t>; From d13b852bd62c488a7a6ce2d84d141c9354f4b2b1 Mon Sep 17 00:00:00 2001 From: Eelis Date: Thu, 23 Jul 2020 00:50:05 +0200 Subject: [PATCH 3/5] [lex.ext] Simplify use of \placeholder. (#4091) --- source/lex.tex | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/lex.tex b/source/lex.tex index 20d6315f62..d3ad3baf9f 100644 --- a/source/lex.tex +++ b/source/lex.tex @@ -1915,7 +1915,7 @@ If \placeholder{S} contains a raw literal operator, the literal \placeholder{L} is treated as a call of the form \begin{codeblock} -operator "" @\placeholder{X}@(@"\placeholder{n}{"}@) +operator "" @\placeholder{X}@("@\placeholder{n}@") \end{codeblock} Otherwise (\placeholder{S} contains a numeric literal operator template), \placeholder{L} is treated as a call of the form @@ -1941,7 +1941,7 @@ If \placeholder{S} contains a raw literal operator, the \grammarterm{literal} \placeholder{L} is treated as a call of the form \begin{codeblock} -operator "" @\placeholder{X}@(@"\placeholder{f}{"}@) +operator "" @\placeholder{X}@("@\placeholder{f}@") \end{codeblock} Otherwise (\placeholder{S} contains a numeric literal operator template), \placeholder{L} is treated as a call of the form From 655ab63c8db8c00754f8c743e02234762558810a Mon Sep 17 00:00:00 2001 From: Eelis Date: Tue, 8 Sep 2020 19:23:21 +0200 Subject: [PATCH 4/5] [std] Remove superfluous final \rowsep or \hline in tables. (#4157) --- source/atomics.tex | 4 ++-- source/containers.tex | 4 ++-- source/diagnostics.tex | 2 +- source/iostreams.tex | 6 +++--- source/lib-intro.tex | 4 ++-- source/preprocessor.tex | 2 +- source/regex.tex | 2 +- source/time.tex | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/source/atomics.tex b/source/atomics.tex index e9c51a0611..39d68ddfa3 100644 --- a/source/atomics.tex +++ b/source/atomics.tex @@ -2240,7 +2240,7 @@ bitwise exclusive or \\ \tcode{and} & \tcode{\&} & - bitwise and &&&\\\hline + bitwise and &&&\\ \end{floattable} \indexlibraryglobal{atomic_fetch_add}% @@ -2585,7 +2585,7 @@ addition & \tcode{sub} & \tcode{-} & - subtraction \\ \hline + subtraction \\ \end{floattable} \indexlibraryglobal{atomic_fetch_add}% diff --git a/source/containers.tex b/source/containers.tex index 3926281f65..a81bd64a12 100644 --- a/source/containers.tex +++ b/source/containers.tex @@ -27,7 +27,7 @@ \tcode{}, \tcode{} \\ \rowsep \ref{container.adaptors} & Container adaptors & \tcode{}, \tcode{} \\ \rowsep -\ref{views} & Views & \tcode{} \\ \rowsep +\ref{views} & Views & \tcode{} \\ \end{libsumtab} @@ -415,7 +415,7 @@ \tcode{a.crend()} & \tcode{const_reverse_iterator} & \tcode{const_cast(a).rend()} & - constant \\ \rowsep + constant \\ \end{libreqtab4a} \pnum diff --git a/source/diagnostics.tex b/source/diagnostics.tex index 93b0fd6e40..ac074815b2 100644 --- a/source/diagnostics.tex +++ b/source/diagnostics.tex @@ -18,7 +18,7 @@ \ref{std.exceptions} & Exception classes & \tcode{} \\ \rowsep \ref{assertions} & Assertions & \tcode{} \\ \rowsep \ref{errno} & Error numbers & \tcode{} \\ \rowsep -\ref{syserr} & System error support & \tcode{} \\ \rowsep +\ref{syserr} & System error support & \tcode{} \\ \end{libsumtab} \rSec1[std.exceptions]{Exception classes} diff --git a/source/iostreams.tex b/source/iostreams.tex index 0fd9d12ae7..79eb93b16c 100644 --- a/source/iostreams.tex +++ b/source/iostreams.tex @@ -1728,7 +1728,7 @@ \tcode{p - q} & \tcode{streamoff} & distance & - \tcode{p == q + (p - q)} \\ \rowsep + \tcode{p == q + (p - q)} \\ \end{libreqtab4c} \pnum @@ -13720,7 +13720,7 @@ \recommended For POSIX-based systems, native and generic formats are equivalent and the character sequence should always be interpreted in the same way. -\\\rowsep +\\ \end{floattable} \rSec3[fs.enum.file.type]{Enum class \tcode{file_type}} @@ -13882,7 +13882,7 @@ \tcode{all | set_uid | set_gid | sticky_bit} \\ \rowsep \tcode{unknown} & \tcode{0xFFFF} & & The permissions are not known, such as when a \tcode{file_status} object - is created without specifying the permissions \\ \rowsep + is created without specifying the permissions \\ \end{floattable} \rSec3[fs.enum.perm.opts]{Enum class \tcode{perm_options}} diff --git a/source/lib-intro.tex b/source/lib-intro.tex index dfc91bf50d..976b9880d0 100644 --- a/source/lib-intro.tex +++ b/source/lib-intro.tex @@ -1203,7 +1203,7 @@ \ref{concepts} & Concepts library & \tcode{} \\ \rowsep \ref{meta} & Type traits & \tcode{} \\ \rowsep \ref{bit} & Bit manipulation & \tcode{} \\ \rowsep -\ref{atomics} & Atomics & \tcode{} \\ \rowsep +\ref{atomics} & Atomics & \tcode{} \\ \end{libsumtab} \pnum @@ -1635,7 +1635,7 @@ \tcode{!(a == np)} \\ \tcode{np != a} & & - \\ \rowsep + \\ \end{oldconcepttable} \rSec3[hash.requirements]{\oldconcept{Hash} requirements} diff --git a/source/preprocessor.tex b/source/preprocessor.tex index 370df074b9..b74f2f6c78 100644 --- a/source/preprocessor.tex +++ b/source/preprocessor.tex @@ -1777,7 +1777,7 @@ \defnxname{cpp_using_enum} & \tcode{201907L} \\ \rowsep \defnxname{cpp_variable_templates} & \tcode{201304L} \\ \rowsep \defnxname{cpp_variadic_templates} & \tcode{200704L} \\ \rowsep -\defnxname{cpp_variadic_using} & \tcode{201611L} \\ \rowsep +\defnxname{cpp_variadic_using} & \tcode{201611L} \\ \end{LongTable} \pnum diff --git a/source/regex.tex b/source/regex.tex index ddfdcd8a4f..dafef1a862 100644 --- a/source/regex.tex +++ b/source/regex.tex @@ -1215,7 +1215,7 @@ \tcode{"s"} & \tcode{L"s"} & \tcode{ctype_base::space} \\ \rowsep \tcode{"upper"} & \tcode{L"upper"} & \tcode{ctype_base::upper} \\ \rowsep \tcode{"w"} & \tcode{L"w"} & \tcode{ctype_base::alnum} \\ \rowsep -\tcode{"xdigit"} & \tcode{L"xdigit"} & \tcode{ctype_base::xdigit} \\ \rowsep +\tcode{"xdigit"} & \tcode{L"xdigit"} & \tcode{ctype_base::xdigit} \\ \end{floattable} \rSec1[re.regex]{Class template \tcode{basic_regex}} diff --git a/source/time.tex b/source/time.tex index f53b644af8..1fbe096225 100644 --- a/source/time.tex +++ b/source/time.tex @@ -21,7 +21,7 @@ \ref{time.zone} & Time zones & \\ \ref{time.format} & Formatting & \\ \ref{time.parse} & Parsing & \\ \rowsep -\ref{ctime.syn} & C library time utilities & \tcode{} \\ \rowsep +\ref{ctime.syn} & C library time utilities & \tcode{} \\ \end{libsumtab} \pnum From ff568a3f7e08c6e721cf3fcb9c28571deb11bbd2 Mon Sep 17 00:00:00 2001 From: Jens Maurer Date: Tue, 8 Sep 2020 21:02:40 +0200 Subject: [PATCH 5/5] [range.elements.iterator] Add missing 'friend' for operator-. (#4158) --- source/ranges.tex | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/ranges.tex b/source/ranges.tex index d6b5f2887f..5e0220dd39 100644 --- a/source/ranges.tex +++ b/source/ranges.tex @@ -6678,7 +6678,7 @@ \indexlibrarymember{operator-}{elements_view::iterator}% \begin{itemdecl} -constexpr @\exposid{iterator}@ operator-(const @\exposid{iterator}@& x, difference_type y) +friend constexpr @\exposid{iterator}@ operator-(const @\exposid{iterator}@& x, difference_type y) requires @\libconcept{random_access_range}@<@\exposid{Base}@>; \end{itemdecl} @@ -6690,7 +6690,7 @@ \indexlibrarymember{operator-}{elements_view::iterator}% \begin{itemdecl} -constexpr difference_type operator-(const @\exposid{iterator}@& x, const @\exposid{iterator}@& y) +friend constexpr difference_type operator-(const @\exposid{iterator}@& x, const @\exposid{iterator}@& y) requires @\libconcept{random_access_range}@<@\exposid{Base}@>; \end{itemdecl}