Skip to content

Commit 8146381

Browse files
committed
Use 'well-formed' (with hyphen) consistenly.
Fixes #1618.
1 parent c42d836 commit 8146381

File tree

4 files changed

+22
-22
lines changed

4 files changed

+22
-22
lines changed

source/derived.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -860,7 +860,7 @@
860860
\end{codeblock}
861861
Both \tcode{VB1::f} and \tcode{VB2::f} override \tcode{A::f} but there
862862
is no overrider of both of them in class \tcode{Error}. This example is
863-
therefore ill-formed. Class \tcode{Okay} is well formed, however,
863+
therefore ill-formed. Class \tcode{Okay} is well-formed, however,
864864
because \tcode{Okay::f} is a final overrider.
865865
\end{example}
866866

source/numerics.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9668,7 +9668,7 @@
96689668
\pnum
96699669
\requires \tcode{T} shall be convertible to \tcode{ForwardIterator}'s value
96709670
type. The expression \tcode{++val}, where \tcode{val} has type \tcode{T}, shall
9671-
be well formed.
9671+
be well-formed.
96729672

96739673
\pnum
96749674
\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: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4414,7 +4414,7 @@
44144414
unless \tcode{is_constructible_v<$\tcode{T}_j$, T>} is \tcode{true},
44154415
and unless the expression
44164416
\tcode{\placeholdernc{FUN}(}\brk\tcode{std::forward<T>(t))} (with \tcode{\placeholdernc{FUN}}
4417-
being the above-mentioned set of imaginary functions) is well formed.
4417+
being the above-mentioned set of imaginary functions) is well-formed.
44184418

44194419
\pnum
44204420
\begin{note}
@@ -4736,7 +4736,7 @@
47364736
\tcode{is_assignable_v<$\tcode{T}_j$\&, T> \&\& is_constructible_v<$\tcode{T}_j$, T>} is \tcode{true},
47374737
and unless the expression \tcode{\placeholdernc{FUN}(std::forward<T>(t))} (with
47384738
\tcode{\placeholdernc{FUN}} being the above-mentioned set of imaginary functions)
4739-
is well formed.
4739+
is well-formed.
47404740

47414741
\pnum
47424742
\begin{note}
@@ -8771,9 +8771,9 @@
87718771
\pnum
87728772
\requires If \tcode{E} is not a reference type,
87738773
construction of the deleter from an rvalue of type
8774-
\tcode{E} shall be well formed and shall not throw an exception.
8774+
\tcode{E} shall be well-formed and shall not throw an exception.
87758775
Otherwise, \tcode{E} is a reference type and construction of the deleter from an
8776-
lvalue of type \tcode{E} shall be well formed and shall not throw an exception.
8776+
lvalue of type \tcode{E} shall be well-formed and shall not throw an exception.
87778777

87788778
\pnum
87798779
\remarks This constructor shall not participate in overload resolution unless:
@@ -8809,7 +8809,7 @@
88098809

88108810
\begin{itemdescr}
88118811
\pnum
8812-
\requires The expression \tcode{get_deleter()(get())} shall be well formed,
8812+
\requires The expression \tcode{get_deleter()(get())} shall be well-formed,
88138813
shall have well-defined behavior, and shall not throw exceptions. \begin{note} The
88148814
use of \tcode{default_delete} requires \tcode{T} to be a complete type.
88158815
\end{note}
@@ -8980,7 +8980,7 @@
89808980

89818981
\begin{itemdescr}
89828982
\pnum
8983-
\requires The expression \tcode{get_deleter()(get())} shall be well formed, shall have
8983+
\requires The expression \tcode{get_deleter()(get())} shall be well-formed, shall have
89848984
well-defined behavior, and shall not throw exceptions.
89858985

89868986
\pnum
@@ -10036,7 +10036,7 @@
1003610036
it is unspecified whether this
1003710037
member function is declared. If it is declared, it is unspecified what its
1003810038
return type is, except that the declaration (although not necessarily the
10039-
definition) of the function shall be well formed.
10039+
definition) of the function shall be well-formed.
1004010040
\end{itemdescr}
1004110041

1004210042
\indexlibrarymember{operator->}{shared_ptr}%
@@ -10053,7 +10053,7 @@
1005310053
it is unspecified whether this member function is declared.
1005410054
If it is declared, it is unspecified what its return type is,
1005510055
except that the declaration (although not necessarily the definition)
10056-
of the function shall be well formed.
10056+
of the function shall be well-formed.
1005710057
\end{itemdescr}
1005810058

1005910059
\indexlibrarymember{operator[]}{shared_ptr}%
@@ -10071,7 +10071,7 @@
1007110071
it is unspecified whether this member function is declared.
1007210072
If it is declared, it is unspecified what its return type is,
1007310073
except that the declaration (although not necessarily the definition)
10074-
of the function shall be well formed.
10074+
of the function shall be well-formed.
1007510075

1007610076
\pnum\throws Nothing.
1007710077
\end{itemdescr}
@@ -10147,7 +10147,7 @@
1014710147
\pnum
1014810148
\requires The expression \tcode{::new (pv) T(std::forward<Args>(args)...)},
1014910149
where \tcode{pv} has type \tcode{void*} and points to storage suitable
10150-
to hold an object of type \tcode{T}, shall be well formed. \tcode{A} shall
10150+
to hold an object of type \tcode{T}, shall be well-formed. \tcode{A} shall
1015110151
be an allocator~(\ref{allocator.requirements}). The copy constructor
1015210152
and destructor of \tcode{A} shall not throw exceptions.
1015310153

@@ -10325,7 +10325,7 @@
1032510325
\begin{itemdescr}
1032610326
\pnum
1032710327
\requires The expression \tcode{static_cast<T*>((U*)nullptr)} shall
10328-
be well formed.
10328+
be well-formed.
1032910329

1033010330
\pnum
1033110331
\returns
@@ -10351,7 +10351,7 @@
1035110351
\begin{itemdescr}
1035210352
\pnum
1035310353
\requires The expression \tcode{dynamic_cast<T*>((U*)nullptr)}
10354-
shall be well formed and shall have well defined behavior.
10354+
shall be well-formed and shall have well defined behavior.
1035510355

1035610356
\pnum
1035710357
\returns
@@ -10378,7 +10378,7 @@
1037810378
\begin{itemdescr}
1037910379
\pnum
1038010380
\requires The expression \tcode{const_cast<T*>((U*)nullptr)} shall
10381-
be well formed.
10381+
be well-formed.
1038210382

1038310383
\pnum
1038410384
\returns
@@ -10403,7 +10403,7 @@
1040310403
\begin{itemdescr}
1040410404
\pnum
1040510405
\requires The expression \tcode{reinterpret_cast<T*>((U*)nullptr)}
10406-
shall be well formed.
10406+
shall be well-formed.
1040710407

1040810408
\pnum\returns
1040910409
\begin{codeblock}
@@ -11420,7 +11420,7 @@
1142011420
with allocator \tcode{resource()} (see~\ref{allocator.uses.construction})
1142111421
and constructor arguments \tcode{std::forward<Args>(args)...} is well-formed.
1142211422
\begin{note}
11423-
Uses-allocator construction is always well formed
11423+
Uses-allocator construction is always well-formed
1142411424
for types that do not use allocators.\end{note}
1142511425

1142611426
\pnum
@@ -14549,7 +14549,7 @@
1454914549
if the expression
1455014550
\tcode{\placeholdernc{INVOKE}<R>(declval<F\&>(), declval<ArgTypes>()...)},
1455114551
considered as an unevaluated operand (Clause~\ref{expr}), is
14552-
well formed~(\ref{func.require}).
14552+
well-formed~(\ref{func.require}).
1455314553

1455414554
\pnum
1455514555
The \tcode{function} class template is a call
@@ -16437,7 +16437,7 @@
1643716437
\tcode{template <class Fn, class... ArgTypes>}\br
1643816438
\tcode{struct is_invocable;} &
1643916439
The expression \tcode{\placeholdernc{INVOKE}(declval<Fn>(), declval<ArgTypes>()...)}
16440-
is well formed when treated as an unevaluated operand &
16440+
is well-formed when treated as an unevaluated operand &
1644116441
\tcode{Fn} and all types in the parameter pack \tcode{ArgTypes}
1644216442
shall be complete types, \cv{}~\tcode{void}, or
1644316443
arrays of unknown bound. \\ \rowsep
@@ -16446,7 +16446,7 @@
1644616446
\tcode{template <class R, class Fn, class... ArgTypes>}\br
1644716447
\tcode{struct is_invocable_r;} &
1644816448
The expression \tcode{\placeholdernc{INVOKE}<R>(declval<Fn>(), declval<ArgTypes>()...)}
16449-
is well formed when treated as an unevaluated operand &
16449+
is well-formed when treated as an unevaluated operand &
1645016450
\tcode{Fn}, \tcode{R}, and all types in the parameter pack \tcode{ArgTypes}
1645116451
shall be complete types, \cv{}~\tcode{void}, or
1645216452
arrays of unknown bound. \\ \rowsep
@@ -16848,7 +16848,7 @@
1684816848
\tcode{struct invoke_result;}
1684916849
&
1685016850
If the expression \tcode{\placeholdernc{INVOKE}(declval<Fn>(), declval<ArgTypes>()...)}
16851-
is well formed when treated as an unevaluated operand (Clause~\ref{expr}),
16851+
is well-formed when treated as an unevaluated operand (Clause~\ref{expr}),
1685216852
the member typedef \tcode{type} names the type
1685316853
\tcode{decltype(\placeholdernc{INVOKE}(declval<Fn>(), declval<ArgTypes>()...))};
1685416854
otherwise, there shall be no member \tcode{type}. Access checking is

0 commit comments

Comments
 (0)