Skip to content

Rephrase "possibly const value" in terms of types #1563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions source/containers.tex
Original file line number Diff line number Diff line change
Expand Up @@ -866,7 +866,7 @@
and an \tcode{allocator_type} identical to \tcode{allocator_traits<A>::rebind_alloc<T>}
and given an lvalue \tcode{m} of type \tcode{A},
a pointer \tcode{p} of type \tcode{T*},
an expression \tcode{v} of type (possibly \keyword{const}) \tcode{T},
an expression \tcode{v} of type \tcode{T} or \tcode{const T},
and an rvalue \tcode{rv} of type \tcode{T},
the following terms are defined. If \tcode{X}
is not allocator-aware or is a specialization of \tcode{basic_string},
Expand Down Expand Up @@ -2615,7 +2615,7 @@
\tcode{a2} denotes a value of a type with nodes compatible with type
\tcode{X} (\tref{container.node.compat}),
\item
\tcode{b} denotes a possibly \keyword{const} value of type \tcode{X},
\tcode{b} denotes a value or type \tcode{X} or \tcode{const X},
\item
\tcode{u} denotes the name of a variable being declared,
\item
Expand All @@ -2625,9 +2625,9 @@
\tcode{a_eq} denotes a value of type \tcode{X}
when \tcode{X} supports multiple keys,
\item
\tcode{a_tran} denotes a possibly \keyword{const} value of type \tcode{X}
\tcode{a_tran} denotes a value of type \tcode{X} or \tcode{const X}
when the \grammarterm{qualified-id}
\tcode{X::key_compare::is_transpa\-rent} is valid
\tcode{X::key_compare::is_transparent} is valid
and denotes a type\iref{temp.deduct},
\item
\tcode{i} and \tcode{j}
Expand All @@ -2654,7 +2654,7 @@
\item
\tcode{k} denotes a value of type \tcode{X::key_type}, and
\item
\tcode{c} denotes a possibly \keyword{const} value of type \tcode{X::key_compare};
\tcode{c} denotes a value of type \tcode{X::key_compare} or \tcode{const X::key_compare};
\item
\tcode{kl} is a value such that \tcode{a} is partitioned\iref{alg.sorting}
with respect to \tcode{c(x, kl)},
Expand Down Expand Up @@ -4114,15 +4114,15 @@
\tcode{a2} denotes a value of a type with nodes compatible
with type \tcode{X} (\tref{container.node.compat}),
\item
\tcode{b} denotes a possibly const value of type \tcode{X},
\tcode{b} denotes a value of type \tcode{X} or \tcode{const X},
\item
\tcode{a_uniq} denotes a value of type \tcode{X}
when \tcode{X} supports unique keys,
\item
\tcode{a_eq} denotes a value of type \tcode{X}
when \tcode{X} supports equivalent keys,
\item
\tcode{a_tran} denotes a possibly const value of type \tcode{X}
\tcode{a_tran} denotes a value of type \tcode{X} or \tcode{const X}
when the \grammarterm{qualified-id}s
\tcode{X::key_equal::is_transparent} and
\tcode{X::hasher::is_transparent}
Expand Down Expand Up @@ -4151,9 +4151,9 @@
\item
\tcode{k} denotes a value of type \tcode{key_type},
\item
\tcode{hf} denotes a possibly const value of type \tcode{hasher},
\tcode{hf} denotes a value of type \tcode{hasher} or \tcode{const hasher},
\item
\tcode{eq} denotes a possibly const value of type \tcode{key_equal},
\tcode{eq} denotes a value of type \tcode{key_equal} or \tcode{const key_equal},
\item
\tcode{ke} is a value such that
\begin{itemize}
Expand All @@ -4177,7 +4177,7 @@
\item
\tcode{z} denotes a value of type \tcode{float}, and
\item
\tcode{nh} denotes a non-const rvalue of type \tcode{X::node_type}.
\tcode{nh} denotes an rvalue of type \tcode{X::node_type}.
\end{itemize}

\pnum
Expand Down
6 changes: 3 additions & 3 deletions source/numerics.tex
Original file line number Diff line number Diff line change
Expand Up @@ -1571,9 +1571,9 @@
\tcode{T} is the type named by
\tcode{S}'s associated \tcode{result_type};
\item
\tcode{q} is a value of \tcode{S}
\tcode{q} is a value of type \tcode{S}
and
\tcode{r} is a possibly const value of \tcode{S};
\tcode{r} is a value of type \tcode{S} or \tcode{const S};
\item
\tcode{ib} and \tcode{ie} are input iterators
with an unsigned integer \tcode{value_type} of at least 32 bits;
Expand All @@ -1584,7 +1584,7 @@
\tcode{ob} is an output iterator;
and
\item
\tcode{il} is a value of \tcode{initializer_list<T>}.
\tcode{il} is a value of type \tcode{initializer_list<T>}.
\end{itemize}


Expand Down