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.

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

Jump to bottom

[predef.iterators] Singularize heading of singular sentinels. #4031

Merged
merged 2 commits into from Sep 18, 2020
Merged

[predef.iterators] Singularize heading of singular sentinels. #4031

merged 2 commits into from Sep 18, 2020

Conversation

jensmaurer
Copy link
Member

@jensmaurer jensmaurer commented Jun 9, 2020 •
edited

Also adjust stable labels.

Fixes #4028.

CaseyCarter
CaseyCarter approved these changes Jun 9, 2020
View reviewed changes
Copy link
Contributor

@CaseyCarter CaseyCarter left a comment

Choose a reason for hiding this comment

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

Changes are fine, but the commit message is a bit odd since no iterators are affected by the changes. (I suppose this is indirectly my fault for putting sentinel types in [predef.iterators].

@jensmaurer
Copy link
Member Author

Updated commit message.

@jensmaurer jensmaurer changed the title [predef.iterators] Singularize heading of singular iterators. [predef.iterators] Singularize heading of singular sentinels. Jun 9, 2020
JohelEGP
JohelEGP reviewed Jun 9, 2020
View reviewed changes
source/iterators.tex Outdated Show resolved Hide resolved
@jensmaurer jensmaurer added this to the C++20 milestone Jun 25, 2020
@jensmaurer
Copy link
Member Author

@zygoloid , this has a failed Travis check, because it renames some stable labels that were introduced post-C++17. We should fix these for C++20. Please advise how to avoid the Travis failure.

@zygoloid
Copy link
Member

@zygoloid , this has a failed Travis check, because it renames some stable labels that were introduced post-C++17. We should fix these for C++20. Please advise how to avoid the Travis failure.

Build from the C++20 branch, grab the produced xrefindex.glo file, and copy that file over source/xrefprev on the master branch.

@zygoloid zygoloid added the needs rebase The pull request needs a git rebase to resolve merge conflicts. label Sep 16, 2020
@jensmaurer jensmaurer removed the needs rebase The pull request needs a git rebase to resolve merge conflicts. label Sep 16, 2020
@jensmaurer
Copy link
Member Author

Rebased + copied xrefprev as advised.

"xrefprev" also contains page numbers, which is immaterial for its purpose and makes the "diff" larger than it should be. We should only have a preprocessed representation of the old cross-reference in git.

@jensmaurer
Copy link
Member Author

This change (but not the xrefprev repair) should also be applied to C++20, in which case the Travis error "missing default.sentinels" will (indirectly) vanish, after updating xrefprev.

@zygoloid zygoloid merged commit 9433200 into cplusplus:master Sep 18, 2020
@jensmaurer jensmaurer deleted the c24 branch September 18, 2020 05:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JohelEGP JohelEGP JohelEGP left review comments

@CaseyCarter CaseyCarter CaseyCarter approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
C++20 IS
Development

Successfully merging this pull request may close these issues.

[default.sentinels, unreachable.sentinels] Inconsistent grammatical numbering and hanging paragraph
4 participants
@jensmaurer @zygoloid @CaseyCarter @JohelEGP