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

[flat.multiset.defn] Fix minor errors and inconsistencies #6260

Closed
wants to merge 1 commit into from
Closed

[flat.multiset.defn] Fix minor errors and inconsistencies #6260

wants to merge 1 commit into from

Conversation

Saalvage
Copy link
Contributor

@Saalvage Saalvage commented May 28, 2023

[flat.set.defn] and [flat.multiset.defn] are now formatted identically.
Additionally removed erroneous template parameters in two deduction guides (the Key was provided twice).

CC: @tzlaine

[flat.set.defn] and [flat.multiset.defn] are now formatted identically.
Additionally removed erroenous template parameters in two deduction guides.
@tkoeppe
Copy link
Contributor

tkoeppe commented Aug 14, 2023

@jwakely, @CaseyCarter could you kindly take a look?

Comment on lines -17360 to +17364
-> flat_multiset<@\placeholder{iter-value-type}@<InputIterator>, @\placeholder{iter-value-type}@<InputIterator>, Compare>;
-> flat_multiset<@\placeholder{iter-value-type}@<InputIterator>, Compare>;

template<class InputIterator, class Compare = less<@\placeholder{iter-value-type}@<InputIterator>>>
flat_multiset(sorted_equivalent_t, InputIterator, InputIterator, Compare = Compare())
-> flat_multiset<@\placeholder{iter-value-type}@<InputIterator>, @\placeholder{iter-value-type}@<InputIterator>, Compare>;
-> flat_multiset<@\placeholder{iter-value-type}@<InputIterator>, Compare>;
Copy link
Contributor

Choose a reason for hiding this comment

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

This corrects (what to me is) obvious copy-pasta from flat_multimap. I call it "editorial" despite that it's a borderline normative change.

@@ -17163,7 +17163,7 @@
const key_compare& comp = key_compare())
: @\exposid{c}@(std::move(cont)), @\exposid{compare}@(comp) { }
template<class Allocator>
flat_multiset(sorted_equivalent_t, const container_type&, const Allocator& a);
flat_multiset(sorted_equivalent_t, const container_type& cont, const Allocator& a);
Copy link
Contributor

Choose a reason for hiding this comment

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

This agrees with the form of the redeclaration in [flat.multiset.cons], as is consistent with LWG style.

Comment on lines +17332 to +17333
container_type @\exposid{c}@; // \expos
key_compare @\exposid{compare}@; // \expos
Copy link
Contributor

Choose a reason for hiding this comment

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

I refuse to learn the editorial "rules" for comments, so someone else needs to sign off on these two (obivously editorial) lines.

Copy link
Contributor

Choose a reason for hiding this comment

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

While the rules superficially only concern the source code column of the comment, there are subtleties about italic correction here, too, and you shall not be blamed for not participating in those deliberations :-)

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 like an improvement to me.

@tkoeppe
Copy link
Contributor

tkoeppe commented Aug 16, 2023

Thank you, both, and also @Saalvage for the PR!

@tkoeppe
Copy link
Contributor

tkoeppe commented Aug 16, 2023

Applied as aa8a531, thanks!

@tkoeppe tkoeppe closed this Aug 16, 2023
@Saalvage Saalvage deleted the flat.multiset.defn/minor-fixes branch August 16, 2023 12:45
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