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

Consistency cleanups in [containers]: Whitespace #462

Merged
merged 1 commit into from Apr 14, 2015

Conversation

tkoeppe
Copy link
Contributor

@tkoeppe tkoeppe commented Mar 22, 2015

Addresses Issue #400

This part of the clean-up changes only whitespace

  • inserted before commas: foo<A,B> becomes foo<A, B>
  • removed after namespace braces
  • improved indentation consistency (e.g. in the groupings with erase and swap)
  • removed some extraneous linebreaks for things that fit well on one line (mostly in the member function declarations that lead the descriptions)

@@ -7418,7 +7399,7 @@
template <class InputIterator> void insert(InputIterator first, InputIterator last);
void insert(initializer_list<value_type>);

iterator erase(const_iterator position);
iterator erase(const_iterator position);
size_type erase(const key_type& k);
iterator erase(const_iterator first, const_iterator last);
Copy link
Member

Choose a reason for hiding this comment

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

Shouldn't this third erase() overload be lined up too? It is for unordered_map::erase() but not the other unordered containers.

@tkoeppe
Copy link
Contributor Author

tkoeppe commented Apr 1, 2015

I'm sending a second commit to make erase/swap/clear and find/count more consistent.

…part of the cleanup changes only whitespace: inserted before commas, removed after namespace braces, improved indentation consistency, removed some extraneous linebreaks for things that fit well on one line
@jwakely
Copy link
Member

jwakely commented Apr 2, 2015

Apart from one missing space on line 6375 it looks great, and that can be done in another commit if you don't want to update this branch again.

@zygoloid, the only bit I have any hesitation about is removing some line breaks, creating longer lines. Is it safe to assume we're not going to go back to a larger code font, and some longer lines are OK?
See e.g. the very end of 99c10db

jwakely added a commit that referenced this pull request Apr 14, 2015
Consistency cleanups in [containers]: Whitespace
@jwakely jwakely merged commit 90212fe into cplusplus:master Apr 14, 2015
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

3 participants