Skip to content

Commit d8b72f0

Browse files
lprvtkoeppe
authored andcommitted
[module.global.frag] Simplify wording
Also make variable order consistent across bullets.
1 parent 2a9f286 commit d8b72f0

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

source/modules.tex

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -639,14 +639,13 @@
639639
\item
640640
$D$ is decl-reachable from $M$, or
641641
\item
642-
$D$ redeclares the entity declared by $M$ or
643-
$M$ redeclares the entity declared by $D$,
642+
$D$ and $M$ declare the same entity,
644643
and $D$ neither is a friend declaration
645644
nor inhabits a block scope, or
646645
\item
647646
$D$ declares a namespace $N$ and $M$ is a member of $N$, or
648647
\item
649-
one of $M$ and $D$ declares a class or class template $C$
648+
one of $D$ and $M$ declares a class or class template $C$
650649
and the other declares a member or friend of $C$, or
651650
\item
652651
one of $D$ and $M$ declares an enumeration $E$
@@ -659,11 +658,11 @@
659658
\end{footnote}
660659
or
661660
\item
662-
one of $M$ and $D$ declares a template and the other declares
661+
one of $D$ and $M$ declares a template and the other declares
663662
a partial or explicit specialization or
664663
an implicit or explicit instantiation of that template, or
665664
\item
666-
one of $M$ and $D$ declares a class or enumeration type
665+
one of $D$ and $M$ declares a class or enumeration type
667666
and the other introduces a typedef name for linkage purposes for that type.
668667
\end{itemize}
669668
\end{itemize}

0 commit comments

Comments
 (0)