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

[namespace.def]/1 Remove redundant statement #2853

Merged
merged 1 commit into from Jun 12, 2019
Merged

[namespace.def]/1 Remove redundant statement #2853

merged 1 commit into from Jun 12, 2019

Conversation

sdkrystian
Copy link
Contributor

@sdkrystian sdkrystian commented Apr 30, 2019 •
edited

[namespace.def]/1 states:

Every namespace-definition shall appear in the global scope or in a namespace scope

This is redundant, as global scope is a namespace. This could confuse readers to think that these are two separate things, when they in-fact are not.

Proposed change is to remove "in the global scope".

jensmaurer
jensmaurer reviewed Apr 30, 2019
View reviewed changes
source/declarations.tex Outdated Show resolved Hide resolved
jensmaurer
jensmaurer requested changes Apr 30, 2019
View reviewed changes
Copy link
Member

@jensmaurer jensmaurer left a comment

Choose a reason for hiding this comment

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

See comment above.

@jensmaurer jensmaurer added the changes requested Changes to the wording or approach have been requested and not yet applied. label Apr 30, 2019
@sdkrystian
Copy link
Contributor Author

@jensmaurer Should be good now.

jensmaurer
jensmaurer approved these changes Apr 30, 2019
View reviewed changes
Copy link
Member

@jensmaurer jensmaurer 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.

@jensmaurer
Copy link
Member

Please squash ("rebase -i") the commits and fix the commit comment (and the title of this issue) to reflect the current reality.

@jensmaurer jensmaurer removed the changes requested Changes to the wording or approach have been requested and not yet applied. label Apr 30, 2019
@sdkrystian sdkrystian changed the title [namespace.def]/1 Changed redundant statement to note [namespace.def]/1 Remove redundant statement Apr 30, 2019
@sdkrystian
Copy link
Contributor Author

@jensmaurer Should be good now.

@jensmaurer
Copy link
Member

jensmaurer commented May 1, 2019 •
edited

No, you did some kind of merge. Please rebase and force-push instead: "git rebase -i master"

@tkoeppe
Copy link
Contributor

tkoeppe commented May 1, 2019

@jensmaurer: You can also do that as part of merging: "squash and merge" creates a single, merged commit.

@sdkrystian
[namespace.def]/1 Changed redundant statement to note
bab5a6f 
[namespace.def]/1 Applied suggested changes
@sdkrystian
Copy link
Contributor Author

Alright, now it should be good. Let me know if there is anything else I need to take care of.
(I've never used git command line :P)

@jensmaurer
Copy link
Member

@tkoeppe: Yes, but since nobody else chimed in, I need to leave this change for @zygoloid to apply. So I thought I should make it as ready as I can. Unless you're ok with the technical contents of the change (if so, please hit "Approve"), in which case I can merge myself.

@zygoloid zygoloid merged commit 506b670 into cplusplus:master Jun 12, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jensmaurer jensmaurer jensmaurer approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@sdkrystian @jensmaurer @tkoeppe @zygoloid