|
82 | 82 | class path; |
83 | 83 |
|
84 | 84 | template <class Allocator = allocator<path_data::path_data_types>> |
85 | | - class path_factory { |
| 85 | + class path_builder { |
86 | 86 | public: |
87 | 87 | using value_type = path_data::path_data_types; |
88 | 88 | using allocator_type = Allocator; |
89 | 89 | using reference = value_type&; |
90 | 90 | using const_reference = const value_type&; |
91 | | - using size_type = @\impdefx{type of \tcode{path_factory::size_type}}@. // See [container.requirements] in \cppseventeen. |
92 | | - using difference_type = @\impdefx{type of \tcode{path_factory::size_type}}@. // See [container.requirements] in \cppseventeen. |
93 | | - using iterator = @\impdefx{type of \tcode{path_factory::iterator}}@. // See [container.requirements] in \cppseventeen. |
94 | | - using const_iterator = @\impdefx{type of \tcode{path_factory::const_iterator}}@. // See [container.requirements] in \cppseventeen. |
| 91 | + using size_type = @\impdefx{type of \tcode{path_builder::size_type}}@. // See [container.requirements] in \cppseventeen. |
| 92 | + using difference_type = @\impdefx{type of \tcode{path_builder::size_type}}@. // See [container.requirements] in \cppseventeen. |
| 93 | + using iterator = @\impdefx{type of \tcode{path_builder::iterator}}@. // See [container.requirements] in \cppseventeen. |
| 94 | + using const_iterator = @\impdefx{type of \tcode{path_builder::const_iterator}}@. // See [container.requirements] in \cppseventeen. |
95 | 95 | using reverse_iterator = std::reverse_iterator<iterator>; |
96 | 96 | using const_reverse_iterator = std::reverse_iterator<const_iterator>; |
97 | 97 |
|
98 | | - // \ref{pathfactory.cons}, construct, copy, move, destroy: |
99 | | - path_factory() noexcept(noexcept(Allocator())) : |
100 | | - path_factory(Allocator()) { } |
101 | | - explicit path_factory(const Allocator&) noexcept; |
102 | | - explicit path_factory(size_type n, const Allocator& = Allocator()); |
103 | | - path_factory(size_type n, const value_type& value, |
| 98 | + // \ref{pathbuilder.cons}, construct, copy, move, destroy: |
| 99 | + path_builder() noexcept(noexcept(Allocator())) : |
| 100 | + path_builder(Allocator()) { } |
| 101 | + explicit path_builder(const Allocator&) noexcept; |
| 102 | + explicit path_builder(size_type n, const Allocator& = Allocator()); |
| 103 | + path_builder(size_type n, const value_type& value, |
104 | 104 | const Allocator& = Allocator()); |
105 | 105 | template <class InputIterator> |
106 | | - path_factory(InputIterator first, InputIterator last, |
| 106 | + path_builder(InputIterator first, InputIterator last, |
107 | 107 | const Allocator& = Allocator()); |
108 | | - path_factory(const path_factory& x); |
109 | | - path_factory(path_factory&&) noexcept; |
110 | | - path_factory(const path_factory&, const Allocator&); |
111 | | - path_factory(path_factory&&, const Allocator&); |
112 | | - path_factory(initializer_list<value_type>, const Allocator& = Allocator()); |
113 | | - ~path_factory(); |
114 | | - path_factory& operator=(const path_factory& x); |
115 | | - path_factory& operator=(path_factory&& x) |
| 108 | + path_builder(const path_builder& x); |
| 109 | + path_builder(path_builder&&) noexcept; |
| 110 | + path_builder(const path_builder&, const Allocator&); |
| 111 | + path_builder(path_builder&&, const Allocator&); |
| 112 | + path_builder(initializer_list<value_type>, const Allocator& = Allocator()); |
| 113 | + ~path_builder(); |
| 114 | + path_builder& operator=(const path_builder& x); |
| 115 | + path_builder& operator=(path_builder&& x) |
116 | 116 | noexcept( |
117 | 117 | allocator_traits<Allocator>::propagate_on_container_move_assignment::value |
118 | 118 | || |
119 | 119 | allocator_traits<Allocator>::is_always_equal::value); |
120 | | - path_factory& operator=(initializer_list<value_type>); |
| 120 | + path_builder& operator=(initializer_list<value_type>); |
121 | 121 | template <class InputIterator> |
122 | 122 | void assign(InputIterator first, InputIterator last); |
123 | 123 | void assign(size_type n, const value_type& u); |
124 | 124 | void assign(initializer_list<value_type>); |
125 | 125 | allocator_type get_allocator() const noexcept; |
126 | 126 |
|
127 | | - // \ref{pathfactory.iterators}, iterators: |
| 127 | + // \ref{pathbuilder.iterators}, iterators: |
128 | 128 | iterator begin() noexcept; |
129 | 129 | const_iterator begin() const noexcept; |
130 | 130 | const_iterator cbegin() const noexcept; |
|
141 | 141 | const_reverse_iterator rend() const noexcept; |
142 | 142 | const_reverse_iterator crend() const noexcept; |
143 | 143 |
|
144 | | - // \ref{pathfactory.capacity}, capacity |
| 144 | + // \ref{pathbuilder.capacity}, capacity |
145 | 145 | bool empty() const noexcept; |
146 | 146 | size_type size() const noexcept; |
147 | 147 | size_type max_size() const noexcept; |
|
161 | 161 | reference back(); |
162 | 162 | const_reference back() const; |
163 | 163 |
|
164 | | - // \ref{pathfactory.modifiers}, modifiers: |
| 164 | + // \ref{pathbuilder.modifiers}, modifiers: |
165 | 165 | void new_path() noexcept; |
166 | 166 | void close_path() noexcept; |
167 | 167 | void arc_clockwise(const vector_2d& center, double radius, double angle1, |
|
201 | 201 | initializer_list<value_type> il); |
202 | 202 | iterator erase(const_iterator position); |
203 | 203 | iterator erase(const_iterator first, const_iterator last); |
204 | | - void swap(path_factory&) |
| 204 | + void swap(path_builder&) |
205 | 205 | noexcept(allocator_traits<Allocator>::propagate_on_container_swap::value |
206 | 206 | || allocator_traits<Allocator>::is_always_equal::value); |
207 | 207 | void clear() noexcept; |
208 | 208 |
|
209 | | - // \ref{pathfactory.observers}, observers: |
| 209 | + // \ref{pathbuilder.observers}, observers: |
210 | 210 | experimental::io2d::rectangle path_extents() const noexcept; |
211 | 211 | bool has_current_point() const noexcept; |
212 | 212 | vector_2d current_point() const; |
|
216 | 216 | } |
217 | 217 |
|
218 | 218 | template <class Allocator> |
219 | | - bool operator==(const path_factory<Allocator>& lhs, |
220 | | - const path_factory<Allocator>& rhs); |
| 219 | + bool operator==(const path_builder<Allocator>& lhs, |
| 220 | + const path_builder<Allocator>& rhs); |
221 | 221 | template <class Allocator> |
222 | | - bool operator!=(const path_factory<Allocator>& lhs, |
223 | | - const path_factory<Allocator>& rhs); |
| 222 | + bool operator!=(const path_builder<Allocator>& lhs, |
| 223 | + const path_builder<Allocator>& rhs); |
224 | 224 |
|
225 | | - // \ref{pathfactory.special}, specialized algorithms: |
| 225 | + // \ref{pathbuilder.special}, specialized algorithms: |
226 | 226 | template <class Allocator> |
227 | | - void swap(path_factory<Allocator>& lhs, path_factory<Allocator>& rhs) |
| 227 | + void swap(path_builder<Allocator>& lhs, path_builder<Allocator>& rhs) |
228 | 228 | noexcept(noexcept(lhs.swap(rhs))); |
229 | 229 |
|
230 | 230 | class color_stop; |
|
0 commit comments