Skip to content
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.

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

Merge small selection of editorial fixes since C++17 branched #1677

Closed
wants to merge 51 commits into from

Conversation

zygoloid
Copy link
Member

Thomas, can you double-check this for me? Thanks!

Eelis and others added 27 commits July 17, 2017 14:13
[dcl.init]/6 Merged wording with CWG2196, and added references to [basic.types].
Also revert "[class.union] Only standard-layout unions are
pointer-interconvertible" (0611331) which editorially resolved the same
confilct between the non-normative and normative wording in the opposite
direction, by changing the non-normative wording to match the normative
wording.
[cpp.subst] Replace "is" with "would be" when talking about a
hypothetical alternative replacement list.
@zygoloid zygoloid requested a review from tkoeppe July 21, 2017 14:04
Dawn Perchik and others added 2 commits July 21, 2017 07:53
Reverse order of "For each constructor of C, if C is defined," to
"If C is defined, for each constructor of C," for clarity and to
parallel adjacent "If C is not defined" bullet.
Copy link
Contributor

@tkoeppe tkoeppe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, ship it!

zygoloid and others added 20 commits July 24, 2017 00:51
The introduction of 'concept' to two lists of entities in [basic] was
omitted, since these lists already include the more general 'template'.

[expr.prim.req.compound] Fix example to not be ill-formed due to an
unsatisfiable concept.
…ion.

When the template-head is followed by a concept-definition, it is not
technically followed by a declaration, so avoid claiming that it is.
@tkoeppe
Copy link
Contributor

tkoeppe commented Jul 25, 2017

Closing this since the PR branch has got corrupted. I'll apply the three original commits manually.

@tkoeppe tkoeppe closed this Jul 25, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants