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

[C++17 DIS comment 014] [alg.reverse] reverse has two Requires: clauses #1726

Closed
zygoloid opened this issue Sep 6, 2017 · 6 comments
Closed

[C++17 DIS comment 014] [alg.reverse] reverse has two Requires: clauses #1726

zygoloid opened this issue Sep 6, 2017 · 6 comments
Labels
ballot-comment Response to an NB or ISO comment on a ballot
Milestone
C++17 IS

Comments

@zygoloid
Copy link
Member

zygoloid commented Sep 6, 2017

Figure out what happened here: how did we end up with two Requires: clauses that say the same thing in different ways? Then fix.
@zygoloid zygoloid added the ballot-comment Response to an NB or ISO comment on a ballot label Sep 6, 2017
@zygoloid zygoloid modified the milestone: C++17 IS Sep 6, 2017
@zygoloid zygoloid changed the title [alg.reverse] reverse has two Requires: clauses [C++17 DIS comment 014] [alg.reverse] reverse has two Requires: clauses Sep 6, 2017
@cpplearner
Copy link
Contributor

The first one was introduced in cf099ae, second one in 5c0f40c.

@jwakely
Copy link
Member

jwakely commented Sep 7, 2017

Thanks, it looks like the merge of cf099ae to reorder the elements restored the old form of the Requires: instead of moving the new form that had just been edited by 5c0f40c

So the fix is to removethe first one, and move the second one up to that place.

@jwakely jwakely mentioned this issue Sep 7, 2017
Merged
@jwakely
Copy link
Member

jwakely commented Sep 7, 2017

Reopening, because this was only fixed on master. The commit will need to be cherry-picked and the conflict resolved for the c++17 branch.

@jwakely jwakely reopened this Sep 7, 2017
@tkoeppe
Copy link
Contributor

tkoeppe commented Sep 7, 2017 •
edited by zygoloid

Commit in master: d9075c8

@zygoloid
Copy link
Member Author

Looks good, resolution: ACCEPTED WITH MODIFICATIONS. Existing p1 deleted, p3 moved to p1.

@zygoloid
Copy link
Member Author

Merged to c++17 as 89801f1.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
ballot-comment Response to an NB or ISO comment on a ballot
Projects
None yet
Milestone
C++17 IS
Development

No branches or pull requests
4 participants
@zygoloid @jwakely @tkoeppe @cpplearner