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

Library-wide: Use "meet" for non-concept type requirements #2796

Merged
merged 3 commits into from Jun 17, 2019

Conversation

CaseyCarter
Copy link
Contributor

...instead of "satisfy".

Partially addresses #1263.

@zygoloid
Copy link
Member

@CaseyCarter Any chance you could rebase this in the next day or so, for the pre-Cologne working draft?

@CaseyCarter
Copy link
Contributor Author

@CaseyCarter Any chance you could rebase this in the next day or so, for the pre-Cologne working draft?

I'm taking a look now (I hadn't noticed the tag). It looks like mostly conflicts with the table label rework; this shouldn't be much trouble to fix up.

@CaseyCarter
Copy link
Contributor Author

Rebased.

@jensmaurer jensmaurer removed the needs rebase The pull request needs a git rebase to resolve merge conflicts. label Jun 15, 2019
@jensmaurer jensmaurer requested a review from zygoloid June 15, 2019 05:56
source/time.tex Outdated
@@ -1335,7 +1335,7 @@
The defaulted copy constructor of duration shall be a
constexpr function if and only if the required initialization
of the member \tcode{rep_} for copy and move, respectively, would
satisfy the requirements for a constexpr function.
meet the requirements for a constexpr function.
Copy link
Member

Choose a reason for hiding this comment

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

This one should be "satisfy". See [dcl.constexpr]/3,4,6 and [class.copy.ctor]/12.

@zygoloid zygoloid merged commit 719890e into cplusplus:master Jun 17, 2019
zygoloid pushed a commit that referenced this pull request Jun 17, 2019
@CaseyCarter CaseyCarter deleted the meets branch June 17, 2019 22:31
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

4 participants