Skip to content

Commit 58984d3

Browse files
committed
Use 'well-formed' (with hyphen) consistently.
Fixes #1618.
1 parent 355a20b commit 58984d3

File tree

4 files changed

+21
-21
lines changed

4 files changed

+21
-21
lines changed

source/derived.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -866,7 +866,7 @@
866866
\end{codeblock}
867867
Both \tcode{VB1::f} and \tcode{VB2::f} override \tcode{A::f} but there
868868
is no overrider of both of them in class \tcode{Error}. This example is
869-
therefore ill-formed. Class \tcode{Okay} is well formed, however,
869+
therefore ill-formed. Class \tcode{Okay} is well-formed, however,
870870
because \tcode{Okay::f} is a final overrider.
871871
\end{example}
872872

source/numerics.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9673,7 +9673,7 @@
96739673
\pnum
96749674
\requires \tcode{T} shall be convertible to \tcode{ForwardIterator}'s value
96759675
type. The expression \tcode{++val}, where \tcode{val} has type \tcode{T}, shall
9676-
be well formed.
9676+
be well-formed.
96779677

96789678
\pnum
96799679
\effects For each element referred to by the iterator \tcode{i} in the range

source/special.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
B& operator=(const B &);
4141
};
4242
B& B::operator=(const B& s) {
43-
this->A::operator=(s); // well formed
43+
this->A::operator=(s); // well-formed
4444
return *this;
4545
}
4646
\end{codeblock}

source/utilities.tex

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4064,7 +4064,7 @@
40644064
unless \tcode{is_constructible_v<$\tcode{T}_j$, T>} is \tcode{true},
40654065
and unless the expression
40664066
\tcode{\placeholdernc{FUN}(}\brk\tcode{std::forward<T>(t))} (with \tcode{\placeholdernc{FUN}}
4067-
being the above-mentioned set of imaginary functions) is well formed.
4067+
being the above-mentioned set of imaginary functions) is well-formed.
40684068

40694069
\pnum
40704070
\begin{note}
@@ -4352,7 +4352,7 @@
43524352
\tcode{is_assignable_v<$\tcode{T}_j$\&, T> \&\& is_constructible_v<$\tcode{T}_j$, T>} is \tcode{true},
43534353
and unless the expression \tcode{\placeholdernc{FUN}(std::forward<T>(t))} (with
43544354
\tcode{\placeholdernc{FUN}} being the above-mentioned set of imaginary functions)
4355-
is well formed.
4355+
is well-formed.
43564356

43574357
\pnum
43584358
\begin{note}
@@ -8369,9 +8369,9 @@
83698369
\pnum
83708370
\requires If \tcode{E} is not a reference type,
83718371
construction of the deleter from an rvalue of type
8372-
\tcode{E} shall be well formed and shall not throw an exception.
8372+
\tcode{E} shall be well-formed and shall not throw an exception.
83738373
Otherwise, \tcode{E} is a reference type and construction of the deleter from an
8374-
lvalue of type \tcode{E} shall be well formed and shall not throw an exception.
8374+
lvalue of type \tcode{E} shall be well-formed and shall not throw an exception.
83758375

83768376
\pnum
83778377
\remarks This constructor shall not participate in overload resolution unless:
@@ -8407,7 +8407,7 @@
84078407

84088408
\begin{itemdescr}
84098409
\pnum
8410-
\requires The expression \tcode{get_deleter()(get())} shall be well formed,
8410+
\requires The expression \tcode{get_deleter()(get())} shall be well-formed,
84118411
shall have well-defined behavior, and shall not throw exceptions. \begin{note} The
84128412
use of \tcode{default_delete} requires \tcode{T} to be a complete type.
84138413
\end{note}
@@ -8578,7 +8578,7 @@
85788578

85798579
\begin{itemdescr}
85808580
\pnum
8581-
\requires The expression \tcode{get_deleter()(get())} shall be well formed, shall have
8581+
\requires The expression \tcode{get_deleter()(get())} shall be well-formed, shall have
85828582
well-defined behavior, and shall not throw exceptions.
85838583

85848584
\pnum
@@ -9654,7 +9654,7 @@
96549654
it is unspecified whether this
96559655
member function is declared. If it is declared, it is unspecified what its
96569656
return type is, except that the declaration (although not necessarily the
9657-
definition) of the function shall be well formed.
9657+
definition) of the function shall be well-formed.
96589658
\end{itemdescr}
96599659

96609660
\indexlibrarymember{operator->}{shared_ptr}%
@@ -9671,7 +9671,7 @@
96719671
it is unspecified whether this member function is declared.
96729672
If it is declared, it is unspecified what its return type is,
96739673
except that the declaration (although not necessarily the definition)
9674-
of the function shall be well formed.
9674+
of the function shall be well-formed.
96759675
\end{itemdescr}
96769676

96779677
\indexlibrarymember{operator[]}{shared_ptr}%
@@ -9689,7 +9689,7 @@
96899689
it is unspecified whether this member function is declared.
96909690
If it is declared, it is unspecified what its return type is,
96919691
except that the declaration (although not necessarily the definition)
9692-
of the function shall be well formed.
9692+
of the function shall be well-formed.
96939693

96949694
\pnum\throws Nothing.
96959695
\end{itemdescr}
@@ -10159,7 +10159,7 @@
1015910159
\begin{itemdescr}
1016010160
\pnum
1016110161
\requires The expression \tcode{static_cast<T*>((U*)nullptr)} shall
10162-
be well formed.
10162+
be well-formed.
1016310163

1016410164
\pnum
1016510165
\returns
@@ -10185,7 +10185,7 @@
1018510185
\begin{itemdescr}
1018610186
\pnum
1018710187
\requires The expression \tcode{dynamic_cast<T*>((U*)nullptr)}
10188-
shall be well formed and shall have well-defined behavior.
10188+
shall be well-formed and shall have well-defined behavior.
1018910189

1019010190
\pnum
1019110191
\returns
@@ -10212,7 +10212,7 @@
1021210212
\begin{itemdescr}
1021310213
\pnum
1021410214
\requires The expression \tcode{const_cast<T*>((U*)nullptr)} shall
10215-
be well formed.
10215+
be well-formed.
1021610216

1021710217
\pnum
1021810218
\returns
@@ -10237,7 +10237,7 @@
1023710237
\begin{itemdescr}
1023810238
\pnum
1023910239
\requires The expression \tcode{reinterpret_cast<T*>((U*)nullptr)}
10240-
shall be well formed.
10240+
shall be well-formed.
1024110241

1024210242
\pnum\returns
1024310243
\begin{codeblock}
@@ -11254,7 +11254,7 @@
1125411254
with allocator \tcode{resource()} (see~\ref{allocator.uses.construction})
1125511255
and constructor arguments \tcode{std::forward<Args>(args)...} is well-formed.
1125611256
\begin{note}
11257-
Uses-allocator construction is always well formed
11257+
Uses-allocator construction is always well-formed
1125811258
for types that do not use allocators.\end{note}
1125911259

1126011260
\pnum
@@ -14371,7 +14371,7 @@
1437114371
if the expression
1437214372
\tcode{\placeholdernc{INVOKE}<R>(declval<F\&>(), declval<ArgTypes>()...)},
1437314373
considered as an unevaluated operand\iref{expr}, is
14374-
well formed\iref{func.require}.
14374+
well-formed\iref{func.require}.
1437514375

1437614376
\pnum
1437714377
The \tcode{function} class template is a call
@@ -16266,7 +16266,7 @@
1626616266
\tcode{template <class Fn, class... ArgTypes>}\br
1626716267
\tcode{struct is_invocable;} &
1626816268
The expression \tcode{\placeholdernc{INVOKE}(declval<Fn>(), declval<ArgTypes>()...)}
16269-
is well formed when treated as an unevaluated operand &
16269+
is well-formed when treated as an unevaluated operand &
1627016270
\tcode{Fn} and all types in the parameter pack \tcode{ArgTypes}
1627116271
shall be complete types, \cv{}~\tcode{void}, or
1627216272
arrays of unknown bound. \\ \rowsep
@@ -16275,7 +16275,7 @@
1627516275
\tcode{template <class R, class Fn, class... ArgTypes>}\br
1627616276
\tcode{struct is_invocable_r;} &
1627716277
The expression \tcode{\placeholdernc{INVOKE}<R>(declval<Fn>(), declval<ArgTypes>()...)}
16278-
is well formed when treated as an unevaluated operand &
16278+
is well-formed when treated as an unevaluated operand &
1627916279
\tcode{Fn}, \tcode{R}, and all types in the parameter pack \tcode{ArgTypes}
1628016280
shall be complete types, \cv{}~\tcode{void}, or
1628116281
arrays of unknown bound. \\ \rowsep
@@ -16677,7 +16677,7 @@
1667716677
\tcode{struct invoke_result;}
1667816678
&
1667916679
If the expression \tcode{\placeholdernc{INVOKE}(declval<Fn>(), declval<ArgTypes>()...)}
16680-
is well formed when treated as an unevaluated operand\iref{expr},
16680+
is well-formed when treated as an unevaluated operand\iref{expr},
1668116681
the member typedef \tcode{type} names the type
1668216682
\tcode{decltype(\placeholdernc{INVOKE}(declval<Fn>(), declval<ArgTypes>()...))};
1668316683
otherwise, there shall be no member \tcode{type}. Access checking is

0 commit comments

Comments
 (0)