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

Replace [fig:iostreams.streampos] with words #4299

Merged
merged 2 commits into from Jun 22, 2021
Merged

Conversation

jwakely
Copy link
Member

@jwakely jwakely commented Oct 19, 2020

This supersedes #4298 as it includes that commit, and another one to replace the information in the figure with prose, as I suggested in #4246.

I've also restored the mention of ssize_t and reworded the second footnote in [stream.types], to address my comment at #1986 (comment)

@jwakely jwakely changed the title Replace [fig.iostreams.streampos] with words Replace [fig:iostreams.streampos] with words Oct 19, 2020
@wg21bot wg21bot added the needs rebase The pull request needs a git rebase to resolve merge conflicts. label Jun 15, 2021
@tkoeppe
Copy link
Contributor

tkoeppe commented Jun 22, 2021

@jwakely: could you please rebase this?

@jwakely jwakely removed the needs rebase The pull request needs a git rebase to resolve merge conflicts. label Jun 22, 2021
@jwakely
Copy link
Member Author

jwakely commented Jun 22, 2021

Rebased.

Eelis and others added 2 commits June 22, 2021 14:50
Also add a note to [iostreams.limits.pos] to replace the removed figure.

Fixes cplusplus#4246.
Correct footnote about how uses of streamsize relate to C.
@tkoeppe
Copy link
Contributor

tkoeppe commented Jun 22, 2021

@jwakely: I moved the new note into the commit that deletes the figure; PTAL?

Copy link
Member Author

@jwakely jwakely left a comment

Choose a reason for hiding this comment

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

LGTM

@tkoeppe tkoeppe merged commit bec4ff5 into cplusplus:main Jun 22, 2021
@jwakely jwakely deleted the pr/4298 branch January 22, 2022 09:13
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