Skip to content

Commit 859861b

Browse files
committed
FIXUP P2582R1: Fix formatting errors, move misplaced \item
1 parent 51df1b7 commit 859861b

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

source/overloading.tex

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1295,7 +1295,7 @@
12951295
whose template parameter list is that of \tcode{A} and
12961296
whose template argument list is a specialization of \tcode{A} with
12971297
the template argument list of \tcode{A}\iref{temp.dep.type}
1298-
having a member typedef type designating a template specialization with
1298+
having a member typedef \tcode{type} designating a template specialization with
12991299
the template argument list of \tcode{A} but
13001300
with \tcode{C} as the template.
13011301
\begin{note}
@@ -1316,16 +1316,16 @@
13161316
};
13171317
template <typename T> struct D : public B<T> {};
13181318

1319-
C c(42); // OK, \tcode{deduces C<int>}
1320-
D d(42); // Error: deduction failed, no inherited deduction guides
1319+
C c(42); // OK, deduces \tcode{C<int>}
1320+
D d(42); // error: deduction failed, no inherited deduction guides
13211321
B(int) -> B<char>;
13221322
C c2(42); // OK, deduces \tcode{C<char>}
13231323

13241324
template <typename T> struct E : public B<int> {
13251325
using B<int>::B;
13261326
};
13271327

1328-
E e(42); // Error: deduction failed, arguments of \tcode{E} cannot be deduced from guides introduced
1328+
E e(42); // error: deduction failed, arguments of \tcode{E} cannot be deduced from guides introduced
13291329

13301330
template <typename T, typename U, typename V> struct F {
13311331
F(T, U, V);
@@ -1805,18 +1805,6 @@
18051805
\end{example}
18061806
or, if not that,
18071807

1808-
\item
1809-
\tcode{F1} and \tcode{F2} are generated
1810-
from class template argument deduction\iref{over.match.class.deduct}
1811-
for a class \tcode{D}, and
1812-
\tcode{F2} is generated
1813-
from inheriting constructors from a base class of \tcode{D}
1814-
while \tcode{F1} is not, and
1815-
for each explicit function argument,
1816-
the corresponding parameters of \tcode{F1} and \tcode{F2}
1817-
are either both ellipses or have the same type,
1818-
or, if not that,
1819-
18201808
\item
18211809
\tcode{F1} and \tcode{F2} are rewritten candidates, and
18221810
\tcode{F2} is a synthesized candidate
@@ -1833,6 +1821,18 @@
18331821
\end{example}
18341822
or, if not that
18351823

1824+
\item
1825+
\tcode{F1} and \tcode{F2} are generated
1826+
from class template argument deduction\iref{over.match.class.deduct}
1827+
for a class \tcode{D}, and
1828+
\tcode{F2} is generated
1829+
from inheriting constructors from a base class of \tcode{D}
1830+
while \tcode{F1} is not, and
1831+
for each explicit function argument,
1832+
the corresponding parameters of \tcode{F1} and \tcode{F2}
1833+
are either both ellipses or have the same type,
1834+
or, if not that,
1835+
18361836
\item
18371837
\tcode{F1} is generated from a
18381838
\grammarterm{deduction-guide}\iref{over.match.class.deduct}

0 commit comments

Comments
 (0)