Skip to content

Commit db9aee9

Browse files
CaseyCarterzygoloid
authored andcommitted
[customization.point.object][meta.trans.other] Replace "user-defined" added by P0898R3 with "program-defined"
...to be consistent with the intent of LWG2139
1 parent 03f3764 commit db9aee9

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

source/lib-intro.tex

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -944,8 +944,8 @@
944944

945945
\pnum
946946
A \term{customization point object} is a function object\iref{function.objects}
947-
with a literal class type that interacts with user-defined types while enforcing
948-
semantic requirements on that interaction.
947+
with a literal class type that interacts with program-defined types while
948+
enforcing semantic requirements on that interaction.
949949

950950
\pnum
951951
The type of a customization point object shall satisfy
@@ -970,15 +970,16 @@
970970
\pnum
971971
\begin{note}
972972
Many of the customization point objects in the library evaluate function call
973-
expressions with an unqualified name which results in a call to a user-defined
974-
function found by argument dependent name lookup\iref{basic.lookup.argdep}. To
975-
preclude such an expression resulting in a call to unconstrained functions with
976-
the same name in namespace \tcode{std}, customization point objects specify that
977-
lookup for these expressions is performed in a context that includes deleted
978-
overloads matching the signatures of overloads defined in namespace \tcode{std}.
979-
When the deleted overloads are viable, user-defined overloads need be more
980-
specialized\iref{temp.func.order} or more constrained\iref{temp.constr.order} to
981-
be used by a customization point object.
973+
expressions with an unqualified name which results in a call to a
974+
program-defined function found by argument dependent name
975+
lookup\iref{basic.lookup.argdep}. To preclude such an expression resulting in a
976+
call to unconstrained functions with the same name in namespace \tcode{std},
977+
customization point objects specify that lookup for these expressions is
978+
performed in a context that includes deleted overloads matching the signatures
979+
of overloads defined in namespace \tcode{std}. When the deleted overloads are
980+
viable, program-defined overloads need be more specialized\iref{temp.func.order}
981+
or more constrained\iref{temp.constr.order} to be used by a customization point
982+
object.
982983
\end{note}
983984

984985
\rSec3[functions.within.classes]{Functions within classes}

source/utilities.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16994,7 +16994,7 @@
1699416994
\hspace*{2ex}\tcode{basic_common_reference;}
1699516995
&
1699616996
A program may specialize this trait if at least one
16997-
template parameter in the specialization depends on a user-defined
16997+
template parameter in the specialization depends on a program-defined
1699816998
type. If there is a member \tcode{type}, it shall be a
1699916999
\grammarterm{typedef-name}.
1700017000
\begin{note}

0 commit comments

Comments
 (0)