Skip to content

Editorial odr tweaks #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 15, 2017
Merged

Editorial odr tweaks #118

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e819214
[basic.def.odr] Remove changes to paragraph 1
Jul 14, 2017
5e43a6b
[gram.basic] Remove redundant changes to make concepts entities
Jul 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 1 addition & 24 deletions src/basic.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,9 @@
%!TEX root = ts.tex
\rSec0[basic]{Basic concepts}

\rSec1[gram.basic]{Basic concepts}

Add concepts to the list of entities.

\begin{quote}
\setcounter{Paras}{2}
\pnum
An \defn{entity} is a value, object, reference, function, enumerator, type,
class member, bit-field, template, \added{concept,} template specialization,
namespace, or parameter pack.
\end{quote}

\rSec1[basic.def.odr]{One-definition rule}

Modify paragraph 1.

\begin{quote}
\pnum
No translation unit shall contain more than one definition of any
variable, function, class type, enumeration type,
\removed{or} template\added{, or concept}.
\end{quote}

Modify paragraph 6. The full requirements allowing multiple definitions
in different translation units are unchanged and therefore omitted in this
text.
Modify at the beginning of paragraph 6.

\begin{quote}
\setcounter{Paras}{5}
Expand Down