Skip to content

Commit 2b8c164

Browse files
authored
Merge pull request #118 from hubert-reinterpretcast/editorial_odr_tweaks
Editorial odr tweaks
2 parents 9525051 + 5e43a6b commit 2b8c164

File tree

1 file changed

+1
-24
lines changed

1 file changed

+1
-24
lines changed

src/basic.tex

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,9 @@
11
%!TEX root = ts.tex
22
\rSec0[basic]{Basic concepts}
33

4-
\rSec1[gram.basic]{Basic concepts}
5-
6-
Add concepts to the list of entities.
7-
8-
\begin{quote}
9-
\setcounter{Paras}{2}
10-
\pnum
11-
An \defn{entity} is a value, object, reference, function, enumerator, type,
12-
class member, bit-field, template, \added{concept,} template specialization,
13-
namespace, or parameter pack.
14-
\end{quote}
15-
164
\rSec1[basic.def.odr]{One-definition rule}
175

18-
Modify paragraph 1.
19-
20-
\begin{quote}
21-
\pnum
22-
No translation unit shall contain more than one definition of any
23-
variable, function, class type, enumeration type,
24-
\removed{or} template\added{, or concept}.
25-
\end{quote}
26-
27-
Modify paragraph 6. The full requirements allowing multiple definitions
28-
in different translation units are unchanged and therefore omitted in this
29-
text.
6+
Modify at the beginning of paragraph 6.
307

318
\begin{quote}
329
\setcounter{Paras}{5}

0 commit comments

Comments
 (0)