[concepts.integral] Merge [concept.integral], [concept.signed.int] and [concept.unsigned.int]

Author: CaseyCarter

Diff for: source/concepts.tex

@@ -156,15 +156,13 @@
   template<class T, class U>
   concept Common = @\seebelow@;
 
-  // \ref{concept.integral}, Integral
+  // \ref{concepts.integral}, Integral concepts
   template<class T>
   concept Integral = @\seebelow@;
 
-  // \ref{concept.signed.int}, SignedIntegral
   template<class T>
   concept SignedIntegral = @\seebelow@;
 
-  // \ref{concept.unsigned.int}, UnsignedIntegral
   template<class T>
   concept UnsignedIntegral = @\seebelow@;
 
@@ -445,20 +443,20 @@
 
 \end{itemdescr}
 
-\rSec2[concept.integral]{Concept \libconcept{Integral}}
+\rSec2[concepts.integral]{Integral concepts}
 
 \indexlibrary{\idxcode{Integral}}%
+\indexlibrary{\idxcode{SignedIntegral}}%
+\indexlibrary{\idxcode{UnsignedIntegral}}%
 \begin{itemdecl}
 template<class T>
 concept Integral = is_integral_v<T>;
-\end{itemdecl}
 
-\rSec2[concept.signed.int]{Concept \libconcept{SignedIntegral}}
-
-\indexlibrary{\idxcode{SignedIntegral}}%
-\begin{itemdecl}
 template<class T>
 concept SignedIntegral = Integral<T> && is_signed_v<T>;
+
+template<class T>
+concept UnsignedIntegral = Integral<T> && !SignedIntegral<T>;
 \end{itemdecl}
 
 \begin{itemdescr}
@@ -467,21 +465,11 @@
 \tcode{\libconcept{SignedIntegral}<T>} can be satisfied even by types that are
 not signed integral types\iref{basic.fundamental}; for example, \tcode{char}.
 \end{note}
-\end{itemdescr}
-
-\rSec2[concept.unsigned.int]{Concept \libconcept{UnsignedIntegral}}
 
-\indexlibrary{\idxcode{UnsignedIntegral}}%
-\begin{itemdecl}
-template<class T>
-concept UnsignedIntegral = Integral<T> && !SignedIntegral<T>;
-\end{itemdecl}
-
-\begin{itemdescr}
 \pnum
 \begin{note}
 \tcode{\libconcept{UnsignedIntegral}<T>} can be satisfied even by types that are
-not unsigned integral types\iref{basic.fundamental}; for example, \tcode{char}.
+not unsigned integral types\iref{basic.fundamental}; for example, \tcode{bool}.
 \end{note}
 \end{itemdescr}