Skip to content

Commit e1ba878

Browse files
committed
Use 'well-formed' (with hyphen) consistently.
Fixes #1618.
1 parent bbca26c commit e1ba878

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
@@ -4062,7 +4062,7 @@
40624062
unless \tcode{is_constructible_v<$\tcode{T}_j$, T>} is \tcode{true},
40634063
and unless the expression
40644064
\tcode{\placeholdernc{FUN}(}\brk\tcode{std::forward<T>(t))} (with \tcode{\placeholdernc{FUN}}
4065-
being the above-mentioned set of imaginary functions) is well formed.
4065+
being the above-mentioned set of imaginary functions) is well-formed.
40664066

40674067
\pnum
40684068
\begin{note}
@@ -4350,7 +4350,7 @@
43504350
\tcode{is_assignable_v<$\tcode{T}_j$\&, T> \&\& is_constructible_v<$\tcode{T}_j$, T>} is \tcode{true},
43514351
and unless the expression \tcode{\placeholdernc{FUN}(std::forward<T>(t))} (with
43524352
\tcode{\placeholdernc{FUN}} being the above-mentioned set of imaginary functions)
4353-
is well formed.
4353+
is well-formed.
43544354

43554355
\pnum
43564356
\begin{note}
@@ -8367,9 +8367,9 @@
83678367
\pnum
83688368
\requires If \tcode{E} is not a reference type,
83698369
construction of the deleter from an rvalue of type
8370-
\tcode{E} shall be well formed and shall not throw an exception.
8370+
\tcode{E} shall be well-formed and shall not throw an exception.
83718371
Otherwise, \tcode{E} is a reference type and construction of the deleter from an
8372-
lvalue of type \tcode{E} shall be well formed and shall not throw an exception.
8372+
lvalue of type \tcode{E} shall be well-formed and shall not throw an exception.
83738373

83748374
\pnum
83758375
\remarks This constructor shall not participate in overload resolution unless:
@@ -8405,7 +8405,7 @@
84058405

84068406
\begin{itemdescr}
84078407
\pnum
8408-
\requires The expression \tcode{get_deleter()(get())} shall be well formed,
8408+
\requires The expression \tcode{get_deleter()(get())} shall be well-formed,
84098409
shall have well-defined behavior, and shall not throw exceptions. \begin{note} The
84108410
use of \tcode{default_delete} requires \tcode{T} to be a complete type.
84118411
\end{note}
@@ -8576,7 +8576,7 @@
85768576

85778577
\begin{itemdescr}
85788578
\pnum
8579-
\requires The expression \tcode{get_deleter()(get())} shall be well formed, shall have
8579+
\requires The expression \tcode{get_deleter()(get())} shall be well-formed, shall have
85808580
well-defined behavior, and shall not throw exceptions.
85818581

85828582
\pnum
@@ -9652,7 +9652,7 @@
96529652
it is unspecified whether this
96539653
member function is declared. If it is declared, it is unspecified what its
96549654
return type is, except that the declaration (although not necessarily the
9655-
definition) of the function shall be well formed.
9655+
definition) of the function shall be well-formed.
96569656
\end{itemdescr}
96579657

96589658
\indexlibrarymember{operator->}{shared_ptr}%
@@ -9669,7 +9669,7 @@
96699669
it is unspecified whether this member function is declared.
96709670
If it is declared, it is unspecified what its return type is,
96719671
except that the declaration (although not necessarily the definition)
9672-
of the function shall be well formed.
9672+
of the function shall be well-formed.
96739673
\end{itemdescr}
96749674

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

96929692
\pnum\throws Nothing.
96939693
\end{itemdescr}
@@ -10157,7 +10157,7 @@
1015710157
\begin{itemdescr}
1015810158
\pnum
1015910159
\requires The expression \tcode{static_cast<T*>((U*)nullptr)} shall
10160-
be well formed.
10160+
be well-formed.
1016110161

1016210162
\pnum
1016310163
\returns
@@ -10183,7 +10183,7 @@
1018310183
\begin{itemdescr}
1018410184
\pnum
1018510185
\requires The expression \tcode{dynamic_cast<T*>((U*)nullptr)}
10186-
shall be well formed and shall have well-defined behavior.
10186+
shall be well-formed and shall have well-defined behavior.
1018710187

1018810188
\pnum
1018910189
\returns
@@ -10210,7 +10210,7 @@
1021010210
\begin{itemdescr}
1021110211
\pnum
1021210212
\requires The expression \tcode{const_cast<T*>((U*)nullptr)} shall
10213-
be well formed.
10213+
be well-formed.
1021410214

1021510215
\pnum
1021610216
\returns
@@ -10235,7 +10235,7 @@
1023510235
\begin{itemdescr}
1023610236
\pnum
1023710237
\requires The expression \tcode{reinterpret_cast<T*>((U*)nullptr)}
10238-
shall be well formed.
10238+
shall be well-formed.
1023910239

1024010240
\pnum\returns
1024110241
\begin{codeblock}
@@ -11252,7 +11252,7 @@
1125211252
with allocator \tcode{resource()} (see~\ref{allocator.uses.construction})
1125311253
and constructor arguments \tcode{std::forward<Args>(args)...} is well-formed.
1125411254
\begin{note}
11255-
Uses-allocator construction is always well formed
11255+
Uses-allocator construction is always well-formed
1125611256
for types that do not use allocators.\end{note}
1125711257

1125811258
\pnum
@@ -14369,7 +14369,7 @@
1436914369
if the expression
1437014370
\tcode{\placeholdernc{INVOKE}<R>(declval<F\&>(), declval<ArgTypes>()...)},
1437114371
considered as an unevaluated operand (Clause~\ref{expr}), is
14372-
well formed~(\ref{func.require}).
14372+
well-formed~(\ref{func.require}).
1437314373

1437414374
\pnum
1437514375
The \tcode{function} class template is a call
@@ -16264,7 +16264,7 @@
1626416264
\tcode{template <class Fn, class... ArgTypes>}\br
1626516265
\tcode{struct is_invocable;} &
1626616266
The expression \tcode{\placeholdernc{INVOKE}(declval<Fn>(), declval<ArgTypes>()...)}
16267-
is well formed when treated as an unevaluated operand &
16267+
is well-formed when treated as an unevaluated operand &
1626816268
\tcode{Fn} and all types in the parameter pack \tcode{ArgTypes}
1626916269
shall be complete types, \cv{}~\tcode{void}, or
1627016270
arrays of unknown bound. \\ \rowsep
@@ -16273,7 +16273,7 @@
1627316273
\tcode{template <class R, class Fn, class... ArgTypes>}\br
1627416274
\tcode{struct is_invocable_r;} &
1627516275
The expression \tcode{\placeholdernc{INVOKE}<R>(declval<Fn>(), declval<ArgTypes>()...)}
16276-
is well formed when treated as an unevaluated operand &
16276+
is well-formed when treated as an unevaluated operand &
1627716277
\tcode{Fn}, \tcode{R}, and all types in the parameter pack \tcode{ArgTypes}
1627816278
shall be complete types, \cv{}~\tcode{void}, or
1627916279
arrays of unknown bound. \\ \rowsep
@@ -16675,7 +16675,7 @@
1667516675
\tcode{struct invoke_result;}
1667616676
&
1667716677
If the expression \tcode{\placeholdernc{INVOKE}(declval<Fn>(), declval<ArgTypes>()...)}
16678-
is well formed when treated as an unevaluated operand (Clause~\ref{expr}),
16678+
is well-formed when treated as an unevaluated operand (Clause~\ref{expr}),
1667916679
the member typedef \tcode{type} names the type
1668016680
\tcode{decltype(\placeholdernc{INVOKE}(declval<Fn>(), declval<ArgTypes>()...))};
1668116681
otherwise, there shall be no member \tcode{type}. Access checking is

0 commit comments

Comments
 (0)