@@ -66,7 +66,7 @@ class Epic_converter {
6666 if (fit_in_double (n,d)){
6767 return std::make_pair (d,true );
6868 }
69- return std::make_pair ( 0 , false ) ;
69+ return {} ;
7070 }
7171
7272 std::pair<Bbox_2,bool > operator ()(const Bbox_2 b) const
@@ -86,7 +86,7 @@ class Epic_converter {
8686 if (fit_in_double (p.x (),x) && fit_in_double (p.y (),y)){
8787 return std::make_pair (Point_2 (x,y),true );
8888 }
89- return std::make_pair (ORIGIN, false ) ;
89+ return {} ;
9090 }
9191
9292 std::pair<Vector_2,bool > operator ()(const typename IK::Vector_2& v) const
@@ -96,7 +96,7 @@ class Epic_converter {
9696 if (fit_in_double (v.x (),x) && fit_in_double (v.y (),y)){
9797 return std::make_pair (Vector_2 (x,y),true );
9898 }
99- return std::make_pair ( Vector_2 (), false ) ;
99+ return {} ;
100100 }
101101
102102 std::pair<Direction_2,bool > operator ()(const typename IK::Direction_2& d) const
@@ -106,7 +106,7 @@ class Epic_converter {
106106 if (fit_in_double (d.dx (),x) && fit_in_double (d.dy (),y)){
107107 return std::make_pair (Direction_2 (x,y),true );
108108 }
109- return std::make_pair ( Direction_2 (), false ) ;
109+ return {} ;
110110 }
111111
112112 std::pair<Weighted_point_2,bool > operator ()(const typename IK::Weighted_point_2& wp) const
@@ -116,18 +116,18 @@ class Epic_converter {
116116 if (sp.second && w.second ){
117117 return std::make_pair (Weighted_point_2 (sp.first ,w.first ),true );
118118 }
119- return std::make_pair ( Weighted_point_2 (), false ) ;
119+ return {} ;
120120 }
121121
122122 std::pair<Segment_2,bool > operator ()(const typename IK::Segment_2& s) const
123123 {
124124 std::pair<Point_2,bool > sp = operator ()(s.source ());
125125 if (! sp.second ){
126- return std::make_pair ( Segment_2 (), false ) ;
126+ return {} ;
127127 }
128128 std::pair<Point_2,bool > tp = operator ()(s.target ());
129129 if (! tp.second ){
130- return std::make_pair ( Segment_2 (), false ) ;
130+ return {} ;
131131 }
132132 return std::make_pair (Segment_2 (sp.first ,tp.first ), true );
133133 }
@@ -138,18 +138,18 @@ class Epic_converter {
138138 if (a.second && b.second && c.second ){
139139 return std::make_pair (Line_2 (a.first , b.first , c.first ),true );
140140 }
141- return std::make_pair ( Line_2 (), false ) ;
141+ return {} ;
142142 }
143143
144144 std::pair<Ray_2,bool > operator ()(const typename IK::Ray_2& r) const
145145 {
146146 std::pair<Point_2,bool > sp = operator ()(r.source ());
147147 if (! sp.second ){
148- return std::make_pair ( Ray_2 (), false ) ;
148+ return {} ;
149149 }
150150 std::pair<Point_2,bool > tp = operator ()(r.second_point ());
151151 if (! tp.second ){
152- return std::make_pair ( Ray_2 (), false ) ;
152+ return {} ;
153153 }
154154 return std::make_pair (Ray_2 (sp.first ,tp.first ), true );
155155 }
@@ -158,15 +158,15 @@ class Epic_converter {
158158 {
159159 std::pair<Point_2,bool > v0 = operator ()(t.vertex (0 ));
160160 if (! v0.second ){
161- return std::make_pair ( Triangle_2 (), false ) ;
161+ return {} ;
162162 }
163163 std::pair<Point_2,bool > v1 = operator ()(t.vertex (1 ));
164164 if (! v1.second ){
165- return std::make_pair ( Triangle_2 (), false ) ;
165+ return {} ;
166166 }
167167 std::pair<Point_2,bool > v2 = operator ()(t.vertex (2 ));
168168 if (! v2.second ){
169- return std::make_pair ( Triangle_2 (), false ) ;
169+ return {} ;
170170 }
171171 return std::make_pair (Triangle_2 (v0.first ,v1.first , v2.first ), true );
172172 }
@@ -178,18 +178,18 @@ class Epic_converter {
178178 if (c.second && sr.second ){
179179 return std::make_pair (Circle_2 (c.first , sr.first , ci.orientation ()),true );
180180 }
181- return std::make_pair ( Circle_2 (), false ) ;
181+ return {} ;
182182 }
183183
184184 std::pair<Iso_rectangle_2,bool > operator ()(const typename IK::Iso_rectangle_2& ir) const
185185 {
186186 std::pair<Point_2,bool > sp = operator ()((ir.min )());
187187 if (! sp.second ){
188- return std::make_pair ( Iso_rectangle_2 (), false ) ;
188+ return {} ;
189189 }
190190 std::pair<Point_2,bool > tp = operator ()((ir.max )());
191191 if (! tp.second ){
192- return std::make_pair ( Iso_rectangle_2 (), false ) ;
192+ return {} ;
193193 }
194194 return std::make_pair (Iso_rectangle_2 (sp.first ,tp.first ), true );
195195 }
@@ -199,11 +199,11 @@ class Epic_converter {
199199 {
200200 std::pair<Point_3,bool > sp = operator ()(li.point ());
201201 if (! sp.second ){
202- return std::make_pair ( Line_3 (), false ) ;
202+ return {} ;
203203 }
204204 std::pair<Vector_3,bool > tp = operator ()(li.to_vector ());
205205 if (! tp.second ){
206- return std::make_pair ( Line_3 (), false ) ;
206+ return {} ;
207207 }
208208 return std::make_pair (Line_3 (sp.first ,tp.first ), true );
209209 }
@@ -214,22 +214,22 @@ class Epic_converter {
214214 if (a.second && b.second && c.second && d.second ){
215215 return std::make_pair (Plane_3 (a.first , b.first , c.first , d.first ),true );
216216 }
217- return std::make_pair ( Plane_3 (), false ) ;
217+ return {} ;
218218 }
219219
220220 std::pair<Triangle_3,bool > operator ()(const typename IK::Triangle_3& t) const
221221 {
222222 std::pair<Point_3,bool > v0 = operator ()(t.vertex (0 ));
223223 if (! v0.second ){
224- return std::make_pair ( Triangle_3 (), false ) ;
224+ return {} ;
225225 }
226226 std::pair<Point_3,bool > v1 = operator ()(t.vertex (1 ));
227227 if (! v1.second ){
228- return std::make_pair ( Triangle_3 (), false ) ;
228+ return {} ;
229229 }
230230 std::pair<Point_3,bool > v2 = operator ()(t.vertex (2 ));
231231 if (! v2.second ){
232- return std::make_pair ( Triangle_3 (), false ) ;
232+ return {} ;
233233 }
234234 return std::make_pair (Triangle_3 (v0.first ,v1.first , v2.first ), true );
235235 }
@@ -238,19 +238,19 @@ class Epic_converter {
238238 {
239239 std::pair<Point_3,bool > v0 = operator ()(t.vertex (0 ));
240240 if (! v0.second ){
241- return std::make_pair ( Tetrahedron_3 (), false ) ;
241+ return {} ;
242242 }
243243 std::pair<Point_3,bool > v1 = operator ()(t.vertex (1 ));
244244 if (! v1.second ){
245- return std::make_pair ( Tetrahedron_3 (), false ) ;
245+ return {} ;
246246 }
247247 std::pair<Point_3,bool > v2 = operator ()(t.vertex (2 ));
248248 if (! v2.second ){
249- return std::make_pair ( Tetrahedron_3 (), false ) ;
249+ return {} ;
250250 }
251251 std::pair<Point_3,bool > v3 = operator ()(t.vertex (3 ));
252252 if (! v3.second ){
253- return std::make_pair ( Tetrahedron_3 (), false ) ;
253+ return {} ;
254254 }
255255 return std::make_pair (Tetrahedron_3 (v0.first ,v1.first , v2.first , v3.first ), true );
256256 }
@@ -259,11 +259,11 @@ class Epic_converter {
259259 {
260260 std::pair<Point_3,bool > sp = operator ()(r.source ());
261261 if (! sp.second ){
262- return std::make_pair ( Ray_3 (), false ) ;
262+ return {} ;
263263 }
264264 std::pair<Point_3,bool > tp = operator ()(r.second_point ());
265265 if (! tp.second ){
266- return std::make_pair ( Ray_3 (), false ) ;
266+ return {} ;
267267 }
268268 return std::make_pair (Ray_3 (sp.first ,tp.first ), true );
269269 }
@@ -275,7 +275,7 @@ class Epic_converter {
275275 if (fit_in_double (p.x (),x) && fit_in_double (p.y (),y) && fit_in_double (p.z (),z)){
276276 return std::make_pair (Point_3 (x,y,z),true );
277277 }
278- return std::make_pair (ORIGIN, false ) ;
278+ return {} ;
279279 }
280280
281281 std::pair<Vector_3,bool > operator ()(const typename IK::Vector_3& v) const
@@ -285,7 +285,7 @@ class Epic_converter {
285285 if (fit_in_double (v.x (),x) && fit_in_double (v.y (),y) && fit_in_double (v.z (),z)){
286286 return std::make_pair (Vector_3 (x,y,z),true );
287287 }
288- return std::make_pair ( Vector_3 (), false ) ;
288+ return {} ;
289289 }
290290
291291 std::pair<Direction_3,bool > operator ()(const typename IK::Direction_3& d) const
@@ -295,18 +295,18 @@ class Epic_converter {
295295 if (fit_in_double (d.dx (),x) && fit_in_double (d.dy (),y) && fit_in_double (d.dz (),z)){
296296 return std::make_pair (Direction_3 (x,y,z),true );
297297 }
298- return std::make_pair ( Direction_3 (), false ) ;
298+ return {} ;
299299 }
300300
301301 std::pair<Segment_3,bool > operator ()(const typename IK::Segment_3& s) const
302302 {
303303 std::pair<Point_3,bool > sp = operator ()(s.source ());
304304 if (! sp.second ){
305- return std::make_pair ( Segment_3 (), false ) ;
305+ return {} ;
306306 }
307307 std::pair<Point_3,bool > tp = operator ()(s.target ());
308308 if (! tp.second ){
309- return std::make_pair ( Segment_3 (), false ) ;
309+ return {} ;
310310 }
311311 return std::make_pair (Segment_3 (sp.first ,tp.first ), true );
312312 }
@@ -318,7 +318,7 @@ class Epic_converter {
318318 if (sp.second && w.second ){
319319 return std::make_pair (Weighted_point_3 (sp.first ,w.first ),true );
320320 }
321- return std::make_pair ( Weighted_point_3 (), false ) ;
321+ return {} ;
322322 }
323323
324324 std::pair<Sphere_3,bool > operator ()(const typename IK::Sphere_3& s) const
@@ -328,7 +328,7 @@ class Epic_converter {
328328 if (c.second && sr.second ){
329329 return std::make_pair (Sphere_3 (c.first , sr.first , s.orientation ()),true );
330330 }
331- return std::make_pair ( Sphere_3 (), false ) ;
331+ return {} ;
332332 }
333333
334334 std::pair<Circle_3,bool > operator ()(const typename IK::Circle_3& ci) const
@@ -338,18 +338,18 @@ class Epic_converter {
338338 if (c.second && sr.second ){
339339 return std::make_pair (Circle_3 (sr.first , c.first ),true );
340340 }
341- return std::make_pair ( Circle_3 (), false ) ;
341+ return {} ;
342342 }
343343
344344 std::pair<Iso_cuboid_3,bool > operator ()(const typename IK::Iso_cuboid_3& ic) const
345345 {
346346 std::pair<Point_3,bool > sp = operator ()((ic.min )());
347347 if (! sp.second ){
348- return std::make_pair ( Iso_cuboid_3 (), false ) ;
348+ return {} ;
349349 }
350350 std::pair<Point_3,bool > tp = operator ()((ic.max )());
351351 if (! tp.second ){
352- return std::make_pair ( Iso_cuboid_3 (), false ) ;
352+ return {} ;
353353 }
354354 return std::make_pair (Iso_cuboid_3 (sp.first ,tp.first ), true );
355355 }
0 commit comments