Skip to content

Commit b07fd6c

Browse files
jensmaurerzygoloid
authored andcommitted
Use 'well-formed' (with hyphen) consistently.
Fixes #1618.
1 parent af40423 commit b07fd6c

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
@@ -9618,7 +9618,7 @@
96189618
\pnum
96199619
\requires \tcode{T} shall be convertible to \tcode{ForwardIterator}'s value
96209620
type. The expression \tcode{++val}, where \tcode{val} has type \tcode{T}, shall
9621-
be well formed.
9621+
be well-formed.
96229622

96239623
\pnum
96249624
\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}
@@ -8339,9 +8339,9 @@
83398339
\pnum
83408340
\requires If \tcode{E} is not a reference type,
83418341
construction of the deleter from an rvalue of type
8342-
\tcode{E} shall be well formed and shall not throw an exception.
8342+
\tcode{E} shall be well-formed and shall not throw an exception.
83438343
Otherwise, \tcode{E} is a reference type and construction of the deleter from an
8344-
lvalue of type \tcode{E} shall be well formed and shall not throw an exception.
8344+
lvalue of type \tcode{E} shall be well-formed and shall not throw an exception.
83458345

83468346
\pnum
83478347
\remarks This constructor shall not participate in overload resolution unless:
@@ -8377,7 +8377,7 @@
83778377

83788378
\begin{itemdescr}
83798379
\pnum
8380-
\requires The expression \tcode{get_deleter()(get())} shall be well formed,
8380+
\requires The expression \tcode{get_deleter()(get())} shall be well-formed,
83818381
shall have well-defined behavior, and shall not throw exceptions. \begin{note} The
83828382
use of \tcode{default_delete} requires \tcode{T} to be a complete type.
83838383
\end{note}
@@ -8548,7 +8548,7 @@
85488548

85498549
\begin{itemdescr}
85508550
\pnum
8551-
\requires The expression \tcode{get_deleter()(get())} shall be well formed, shall have
8551+
\requires The expression \tcode{get_deleter()(get())} shall be well-formed, shall have
85528552
well-defined behavior, and shall not throw exceptions.
85538553

85548554
\pnum
@@ -9555,7 +9555,7 @@
95559555
it is unspecified whether this
95569556
member function is declared. If it is declared, it is unspecified what its
95579557
return type is, except that the declaration (although not necessarily the
9558-
definition) of the function shall be well formed.
9558+
definition) of the function shall be well-formed.
95599559
\end{itemdescr}
95609560

95619561
\indexlibrarymember{operator->}{shared_ptr}%
@@ -9572,7 +9572,7 @@
95729572
it is unspecified whether this member function is declared.
95739573
If it is declared, it is unspecified what its return type is,
95749574
except that the declaration (although not necessarily the definition)
9575-
of the function shall be well formed.
9575+
of the function shall be well-formed.
95769576
\end{itemdescr}
95779577

95789578
\indexlibrarymember{operator[]}{shared_ptr}%
@@ -9590,7 +9590,7 @@
95909590
it is unspecified whether this member function is declared.
95919591
If it is declared, it is unspecified what its return type is,
95929592
except that the declaration (although not necessarily the definition)
9593-
of the function shall be well formed.
9593+
of the function shall be well-formed.
95949594

95959595
\pnum\throws Nothing.
95969596
\end{itemdescr}
@@ -10063,7 +10063,7 @@
1006310063
\begin{itemdescr}
1006410064
\pnum
1006510065
\requires The expression \tcode{static_cast<T*>((U*)nullptr)} shall
10066-
be well formed.
10066+
be well-formed.
1006710067

1006810068
\pnum
1006910069
\returns
@@ -10089,7 +10089,7 @@
1008910089
\begin{itemdescr}
1009010090
\pnum
1009110091
\requires The expression \tcode{dynamic_cast<T*>((U*)nullptr)}
10092-
shall be well formed and shall have well-defined behavior.
10092+
shall be well-formed and shall have well-defined behavior.
1009310093

1009410094
\pnum
1009510095
\returns
@@ -10116,7 +10116,7 @@
1011610116
\begin{itemdescr}
1011710117
\pnum
1011810118
\requires The expression \tcode{const_cast<T*>((U*)nullptr)} shall
10119-
be well formed.
10119+
be well-formed.
1012010120

1012110121
\pnum
1012210122
\returns
@@ -10141,7 +10141,7 @@
1014110141
\begin{itemdescr}
1014210142
\pnum
1014310143
\requires The expression \tcode{reinterpret_cast<T*>((U*)nullptr)}
10144-
shall be well formed.
10144+
shall be well-formed.
1014510145

1014610146
\pnum\returns
1014710147
\begin{codeblock}
@@ -11171,7 +11171,7 @@
1117111171
with allocator \tcode{resource()} (see~\ref{allocator.uses.construction})
1117211172
and constructor arguments \tcode{std::forward<Args>(args)...} is well-formed.
1117311173
\begin{note}
11174-
Uses-allocator construction is always well formed
11174+
Uses-allocator construction is always well-formed
1117511175
for types that do not use allocators.\end{note}
1117611176

1117711177
\pnum
@@ -14285,7 +14285,7 @@
1428514285
if the expression
1428614286
\tcode{\placeholdernc{INVOKE}<R>(declval<F\&>(), declval<ArgTypes>()...)},
1428714287
considered as an unevaluated operand\iref{expr}, is
14288-
well formed\iref{func.require}.
14288+
well-formed\iref{func.require}.
1428914289

1429014290
\pnum
1429114291
The \tcode{function} class template is a call
@@ -16194,7 +16194,7 @@
1619416194
\tcode{template <class Fn, class... ArgTypes>}\br
1619516195
\tcode{struct is_invocable;} &
1619616196
The expression \tcode{\placeholdernc{INVOKE}(declval<Fn>(), declval<ArgTypes>()...)}
16197-
is well formed when treated as an unevaluated operand &
16197+
is well-formed when treated as an unevaluated operand &
1619816198
\tcode{Fn} and all types in the parameter pack \tcode{ArgTypes}
1619916199
shall be complete types, \cv{}~\tcode{void}, or
1620016200
arrays of unknown bound. \\ \rowsep
@@ -16203,7 +16203,7 @@
1620316203
\tcode{template <class R, class Fn, class... ArgTypes>}\br
1620416204
\tcode{struct is_invocable_r;} &
1620516205
The expression \tcode{\placeholdernc{INVOKE}<R>(declval<Fn>(), declval<ArgTypes>()...)}
16206-
is well formed when treated as an unevaluated operand &
16206+
is well-formed when treated as an unevaluated operand &
1620716207
\tcode{Fn}, \tcode{R}, and all types in the parameter pack \tcode{ArgTypes}
1620816208
shall be complete types, \cv{}~\tcode{void}, or
1620916209
arrays of unknown bound. \\ \rowsep
@@ -16603,7 +16603,7 @@
1660316603
\tcode{struct invoke_result;}
1660416604
&
1660516605
If the expression \tcode{\placeholdernc{INVOKE}(declval<Fn>(), declval<ArgTypes>()...)}
16606-
is well formed when treated as an unevaluated operand\iref{expr},
16606+
is well-formed when treated as an unevaluated operand\iref{expr},
1660716607
the member typedef \tcode{type} names the type
1660816608
\tcode{decltype(\placeholdernc{INVOKE}(declval<Fn>(), declval<ArgTypes>()...))};
1660916609
otherwise, there shall be no member \tcode{type}. Access checking is

0 commit comments

Comments
 (0)