[class.prop] [special] Move definition of eligible special member

functions to the section on special member functions.

Author: zygoloid

source/basic.tex

@@ -4089,7 +4089,7 @@
 \pnum
 When an object of class type \tcode{X}
 is passed to or returned from a function,
-if \tcode{X} has at least one eligible copy or move constructor\iref{class.prop},
+if \tcode{X} has at least one eligible copy or move constructor\iref{special},
 each such constructor is trivial,
 and the destructor of \tcode{X} is either trivial or deleted,
 implementations are permitted

source/classes.tex

@@ -142,32 +142,14 @@
 
 \rSec1[class.prop]{Properties of classes}
 
-\pnum
-Two special member functions are of the same kind if:
-\begin{itemize}
-\item they are both default constructors,
-\item they are both copy or move constructors
-with the same first parameter type, or
-\item they are both copy or move assignment operators
-with the same first parameter type
-and the same \grammarterm{cv-qualifier}s and \grammarterm{ref-qualifier}, if any.
-\end{itemize}
-
-\pnum
-An \defnadj{eligible}{special member function} is a special member function\iref{special} for which:
-\begin{itemize}
-\item the function is not deleted,
-\item the associated constraints\iref{temp.constr}, if any, are satisfied, and
-\item no special member function of the same kind is more constrained\iref{temp.constr.order}.
-\end{itemize}
-
 \pnum
 A \defnadj{trivially copyable}{class} is a class:
 
 \begin{itemize}
-\item that has at least one eligible copy constructor, move constructor,
+\item that has at least one eligible
+copy constructor, move constructor,
 copy assignment operator, or
-move assignment operator~(\ref{class.copy.ctor}, \ref{class.copy.assign}),
+move assignment operator~(\ref{special}, \ref{class.copy.ctor}, \ref{class.copy.assign}),
 \item where each eligible copy constructor, move constructor, copy assignment operator,
 and move assignment operator is trivial, and
 \item that has a trivial, non-deleted destructor\iref{class.dtor}.
@@ -1213,6 +1195,25 @@
 ensures that only derived classes and friends can create objects using it.
 \end{example}
 
+\pnum
+Two special member functions are of the same kind if:
+\begin{itemize}
+\item they are both default constructors,
+\item they are both copy or move constructors
+with the same first parameter type, or
+\item they are both copy or move assignment operators
+with the same first parameter type
+and the same \grammarterm{cv-qualifier}s and \grammarterm{ref-qualifier}, if any.
+\end{itemize}
+
+\pnum
+An \defnadj{eligible}{special member function} is a special member function for which:
+\begin{itemize}
+\item the function is not deleted,
+\item the associated constraints\iref{temp.constr}, if any, are satisfied, and
+\item no special member function of the same kind is more constrained\iref{temp.constr.order}.
+\end{itemize}
+
 \pnum
 For a class, its non-static data members, its non-virtual direct base classes,
 and, if the class is not abstract\iref{class.abstract}, its virtual base

source/declarations.tex

@@ -6071,7 +6071,7 @@
 that is not a destructor is defined as deleted.
 A defaulted special member function
 that is neither a prospective destructor nor
-an eligible special member function\iref{class.prop}
+an eligible special member function\iref{special}
 is defined as deleted.
 A function is
 \defn{user-provided} if it is user-declared and not explicitly

source/expressions.tex

@@ -3111,10 +3111,11 @@
 After these conversions, if the
 argument does not have arithmetic, enumeration, pointer, pointer-to-member,
 or class type, the program is ill-formed. Passing a potentially-evaluated
-argument of class type\iref{class} having an eligible\iref{class.prop} non-trivial
+argument of class type\iref{class} having an eligible non-trivial
 copy constructor, an eligible non-trivial move constructor,
 or a
-non-trivial destructor, with no corresponding parameter, is conditionally-supported with
+non-trivial destructor\iref{special},
+with no corresponding parameter, is conditionally-supported with
 \impldef{passing argument of class type through ellipsis} semantics. If the argument has
 integral or enumeration type that is subject to the integral
 promotions\iref{conv.prom}, or a floating-point type that is subject to the