Skip to content

Commit 069ba13

Browse files
committed
[containers, iterators] Improve linebreaking in synopses and declarations
1 parent 75c10f6 commit 069ba13

File tree

2 files changed

+29
-36
lines changed

2 files changed

+29
-36
lines changed

source/containers.tex

Lines changed: 16 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3805,11 +3805,9 @@
38053805
forward_list() : forward_list(Allocator()) { }
38063806
explicit forward_list(const Allocator&);
38073807
explicit forward_list(size_type n, const Allocator& = Allocator());
3808-
forward_list(size_type n, const T& value,
3809-
const Allocator& = Allocator());
3808+
forward_list(size_type n, const T& value, const Allocator& = Allocator());
38103809
template <class InputIterator>
3811-
forward_list(InputIterator first, InputIterator last,
3812-
const Allocator& = Allocator());
3810+
forward_list(InputIterator first, InputIterator last, const Allocator& = Allocator());
38133811
forward_list(const forward_list& x);
38143812
forward_list(forward_list&& x);
38153813
forward_list(const forward_list& x, const Allocator&);
@@ -3873,10 +3871,8 @@
38733871
// \ref{forwardlist.ops}, \tcode{forward_list} operations
38743872
void splice_after(const_iterator position, forward_list& x);
38753873
void splice_after(const_iterator position, forward_list&& x);
3876-
void splice_after(const_iterator position, forward_list& x,
3877-
const_iterator i);
3878-
void splice_after(const_iterator position, forward_list&& x,
3879-
const_iterator i);
3874+
void splice_after(const_iterator position, forward_list& x, const_iterator i);
3875+
void splice_after(const_iterator position, forward_list&& x, const_iterator i);
38803876
void splice_after(const_iterator position, forward_list& x,
38813877
const_iterator first, const_iterator last);
38823878
void splice_after(const_iterator position, forward_list&& x,
@@ -4580,25 +4576,21 @@
45804576
iterator insert(const_iterator position, T&& x);
45814577
iterator insert(const_iterator position, size_type n, const T& x);
45824578
template <class InputIterator>
4583-
iterator insert(const_iterator position, InputIterator first,
4584-
InputIterator last);
4579+
iterator insert(const_iterator position, InputIterator first, InputIterator last);
45854580
iterator insert(const_iterator position, initializer_list<T> il);
45864581

45874582
iterator erase(const_iterator position);
45884583
iterator erase(const_iterator position, const_iterator last);
4589-
void swap(list&)
4590-
noexcept(allocator_traits<Allocator>::is_always_equal::value);
4584+
void swap(list&) noexcept(allocator_traits<Allocator>::is_always_equal::value);
45914585
void clear() noexcept;
45924586

45934587
// \ref{list.ops}, list operations
45944588
void splice(const_iterator position, list& x);
45954589
void splice(const_iterator position, list&& x);
45964590
void splice(const_iterator position, list& x, const_iterator i);
45974591
void splice(const_iterator position, list&& x, const_iterator i);
4598-
void splice(const_iterator position, list& x,
4599-
const_iterator first, const_iterator last);
4600-
void splice(const_iterator position, list&& x,
4601-
const_iterator first, const_iterator last);
4592+
void splice(const_iterator position, list& x, const_iterator first, const_iterator last);
4593+
void splice(const_iterator position, list&& x, const_iterator first, const_iterator last);
46024594

46034595
void remove(const T& value);
46044596
template <class Predicate> void remove_if(Predicate pred);
@@ -5710,11 +5702,9 @@
57105702
vector() : vector(Allocator()) { }
57115703
explicit vector(const Allocator&);
57125704
explicit vector(size_type n, const Allocator& = Allocator());
5713-
vector(size_type n, const bool& value,
5714-
const Allocator& = Allocator());
5705+
vector(size_type n, const bool& value, const Allocator& = Allocator());
57155706
template <class InputIterator>
5716-
vector(InputIterator first, InputIterator last,
5717-
const Allocator& = Allocator());
5707+
vector(InputIterator first, InputIterator last, const Allocator& = Allocator());
57185708
vector(const vector<bool, Allocator>& x);
57195709
vector(vector<bool, Allocator>&& x);
57205710
vector(const vector&, const Allocator&);
@@ -5772,8 +5762,7 @@
57725762
iterator insert(const_iterator position, const bool& x);
57735763
iterator insert(const_iterator position, size_type n, const bool& x);
57745764
template <class InputIterator>
5775-
iterator insert(const_iterator position,
5776-
InputIterator first, InputIterator last);
5765+
iterator insert(const_iterator position, InputIterator first, InputIterator last);
57775766
iterator insert(const_iterator position, initializer_list<bool> il);
57785767

57795768
iterator erase(const_iterator position);
@@ -9531,11 +9520,11 @@
95319520
priority_queue(const Compare& x, const Container&);
95329521
explicit priority_queue(const Compare& x = Compare(), Container&& = Container());
95339522
template <class InputIterator>
9534-
priority_queue(InputIterator first, InputIterator last,
9535-
const Compare& x, const Container&);
9523+
priority_queue(InputIterator first, InputIterator last, const Compare& x,
9524+
const Container&);
95369525
template <class InputIterator>
95379526
priority_queue(InputIterator first, InputIterator last,
9538-
const Compare& x = Compare(), Container&& = Container());
9527+
const Compare& x = Compare(), Container&& = Container());
95399528
template <class Alloc> explicit priority_queue(const Alloc&);
95409529
template <class Alloc> priority_queue(const Compare&, const Alloc&);
95419530
template <class Alloc> priority_queue(const Compare&, const Container&, const Alloc&);
@@ -9608,12 +9597,9 @@
96089597
\indexlibrary{\idxcode{priority_queue}!constructor}%
96099598
\begin{itemdecl}
96109599
template <class InputIterator>
9611-
priority_queue(InputIterator first, InputIterator last,
9612-
const Compare& x,
9613-
const Container& y);
9600+
priority_queue(InputIterator first, InputIterator last, const Compare& x, const Container& y);
96149601
template <class InputIterator>
9615-
priority_queue(InputIterator first, InputIterator last,
9616-
const Compare& x = Compare(),
9602+
priority_queue(InputIterator first, InputIterator last, const Compare& x = Compare(),
96179603
Container&& y = Container());
96189604
\end{itemdecl}
96199605

source/iterators.tex

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -703,16 +703,19 @@
703703

704704
// \ref{iterator.operations}, iterator operations
705705
template <class InputIterator, class Distance>
706-
constexpr void advance(InputIterator& i, Distance n);
706+
constexpr void
707+
advance(InputIterator& i, Distance n);
707708
template <class InputIterator>
708709
constexpr typename iterator_traits<InputIterator>::difference_type
709-
distance(InputIterator first, InputIterator last);
710+
distance(InputIterator first, InputIterator last);
710711
template <class InputIterator>
711-
constexpr InputIterator next(InputIterator x,
712-
typename iterator_traits<InputIterator>::difference_type n = 1);
712+
constexpr InputIterator
713+
next(InputIterator x,
714+
typename iterator_traits<InputIterator>::difference_type n = 1);
713715
template <class BidirectionalIterator>
714-
constexpr BidirectionalIterator prev(BidirectionalIterator x,
715-
typename iterator_traits<BidirectionalIterator>::difference_type n = 1);
716+
constexpr BidirectionalIterator
717+
prev(BidirectionalIterator x,
718+
typename iterator_traits<BidirectionalIterator>::difference_type n = 1);
716719

717720
// \ref{predef.iterators}, predefined iterators
718721
template <class Iterator> class reverse_iterator;
@@ -1207,6 +1210,7 @@
12071210
constexpr reverse_iterator operator- (difference_type n) const;
12081211
constexpr reverse_iterator& operator-=(difference_type n);
12091212
constexpr @\unspecnc@ operator[](difference_type n) const;
1213+
12101214
protected:
12111215
Iterator current;
12121216
};
@@ -2630,6 +2634,7 @@
26302634
const T* operator->() const;
26312635
istream_iterator& operator++();
26322636
istream_iterator operator++(int);
2637+
26332638
private:
26342639
basic_istream<charT,traits>* in_stream; // \expos
26352640
T value; // \expos
@@ -2847,6 +2852,7 @@
28472852
ostream_iterator& operator*();
28482853
ostream_iterator& operator++();
28492854
ostream_iterator& operator++(int);
2855+
28502856
private:
28512857
basic_ostream<charT,traits>* out_stream; // \expos
28522858
const charT* delim; // \expos
@@ -3015,6 +3021,7 @@
30153021
istreambuf_iterator& operator++();
30163022
proxy operator++(int);
30173023
bool equal(const istreambuf_iterator& b) const;
3024+
30183025
private:
30193026
streambuf_type* sbuf_; // \expos
30203027
};

0 commit comments

Comments
 (0)