diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Direction_2.h b/Cartesian_kernel/include/CGAL/Cartesian/Direction_2.h index 4d27652873c..302299d0898 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Direction_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Direction_2.h @@ -47,7 +47,7 @@ public: DirectionC2() {} DirectionC2(const FT &x, const FT &y) - : base(CGAL::make_array(x, y)) {} + : base{x, y} {} bool operator==(const DirectionC2 &d) const; bool operator!=(const DirectionC2 &d) const; diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Direction_3.h b/Cartesian_kernel/include/CGAL/Cartesian/Direction_3.h index 6cf5c0c8e78..a9c9867a934 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Direction_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Direction_3.h @@ -45,7 +45,7 @@ public: DirectionC3() {} explicit DirectionC3(const Vector_3 &v) - : base(CGAL::make_array(v.x(), v.y(), v.z())) {} + : base{v.x(), v.y(), v.z()} {} // { *this = v.direction(); } explicit DirectionC3(const Line_3 &l) @@ -58,7 +58,7 @@ public: { *this = s.rep().direction(); } DirectionC3(const FT &x, const FT &y, const FT &z) - : base(CGAL::make_array(x, y, z)) {} + : base{x, y, z} {} typename R::Boolean operator==(const DirectionC3 &d) const; typename R::Boolean operator!=(const DirectionC3 &d) const; diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Iso_cuboid_3.h b/Cartesian_kernel/include/CGAL/Cartesian/Iso_cuboid_3.h index 2e22a69b77d..82f319261a0 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Iso_cuboid_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Iso_cuboid_3.h @@ -43,7 +43,7 @@ public: Iso_cuboidC3() {} Iso_cuboidC3(const Point_3 &p, const Point_3 &q, int) - : base(CGAL::make_array(p, q)) + : base{p, q} { // I have to remove the assertions, because of Cartesian_converter. // CGAL_kernel_assertion(p.x()<=q.x()); @@ -68,8 +68,8 @@ public: Iso_cuboidC3(const Point_3 &left, const Point_3 &right, const Point_3 &bottom, const Point_3 &top, const Point_3 &far_, const Point_3 &close) - : base(CGAL::make_array(Construct_point_3()(left.x(), bottom.y(), far_.z()), - Construct_point_3()(right.x(), top.y(), close.z()))) + : base{Construct_point_3()(left.x(), bottom.y(), far_.z()), + Construct_point_3()(right.x(), top.y(), close.z())} { CGAL_kernel_precondition(!less_x(right, left)); CGAL_kernel_precondition(!less_y(top, bottom)); diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Iso_rectangle_2.h b/Cartesian_kernel/include/CGAL/Cartesian/Iso_rectangle_2.h index 6f3b8c40f2a..e238cf57767 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Iso_rectangle_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Iso_rectangle_2.h @@ -43,7 +43,7 @@ public: // : base(p, q) {} Iso_rectangleC2(const Point_2 &p, const Point_2 &q, int) - : base(CGAL::make_array(p, q)) + : base{p, q} { // I have to remove the assertions, because of Cartesian_converter. // CGAL_kernel_assertion(p<=q); diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Line_2.h b/Cartesian_kernel/include/CGAL/Cartesian/Line_2.h index 77ec08c459d..21ff3298338 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Line_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Line_2.h @@ -46,7 +46,7 @@ public: LineC2() {} LineC2(const FT &a, const FT &b, const FT &c) - : base(CGAL::make_array(a, b, c)) {} + : base{a, b, c} {} typename R_::Boolean operator==(const LineC2 &l) const; typename R_::Boolean operator!=(const LineC2 &l) const; diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Plane_3.h b/Cartesian_kernel/include/CGAL/Cartesian/Plane_3.h index d9d873b0847..38a119e1320 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Plane_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Plane_3.h @@ -64,7 +64,7 @@ public: { *this = plane_from_point_direction(o, v.direction()); } PlaneC3(const FT &a, const FT &b, const FT &c, const FT &d) - : base(CGAL::make_array(a, b, c, d)) {} + : base{a, b, c, d} {} PlaneC3(const Line_3 &l, const Point_3 &p) { *this = plane_from_points(l.point(), diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Ray_2.h b/Cartesian_kernel/include/CGAL/Cartesian/Ray_2.h index 8448eba97e7..c703dc79dcd 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Ray_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Ray_2.h @@ -40,7 +40,7 @@ public: {} RayC2(const Point_2 &sp, const Point_2 &secondp) - : base(CGAL::make_array(sp, secondp)) + : base{sp, secondp} {} diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Ray_3.h b/Cartesian_kernel/include/CGAL/Cartesian/Ray_3.h index 15892d8dfc0..7dd67e372ba 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Ray_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Ray_3.h @@ -43,16 +43,16 @@ public: RayC3() {} RayC3(const Point_3 &sp, const Point_3 &secondp) - : base(CGAL::make_array(sp, secondp)) {} + : base{sp, secondp} {} RayC3(const Point_3 &sp, const Vector_3 &v) - : base(CGAL::make_array(sp, sp + v)) {} + : base{sp, sp + v} {} RayC3(const Point_3 &sp, const Direction_3 &d) - : base(CGAL::make_array(sp, sp + d.to_vector())) {} + : base{sp, sp + d.to_vector()} {} RayC3(const Point_3 &sp, const Line_3 &l) - : base(CGAL::make_array(sp, sp + l.to_vector())) {} + : base{sp, sp + l.to_vector()} {} typename R::Boolean operator==(const RayC3 &r) const; typename R::Boolean operator!=(const RayC3 &r) const; diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Segment_2.h b/Cartesian_kernel/include/CGAL/Cartesian/Segment_2.h index 3672c797e7c..25bff4769fd 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Segment_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Segment_2.h @@ -39,7 +39,7 @@ public: {} SegmentC2(const Point_2 &sp, const Point_2 &ep) - : base(CGAL::make_array(sp, ep)) + : base{sp, ep} {} const Point_2 & diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Segment_3.h b/Cartesian_kernel/include/CGAL/Cartesian/Segment_3.h index 122626550f4..8ab1d082d6f 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Segment_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Segment_3.h @@ -42,7 +42,7 @@ public: SegmentC3() {} SegmentC3(const Point_3 &sp, const Point_3 &ep) - : base(CGAL::make_array(sp, ep)) {} + : base{sp, ep} {} bool has_on(const Point_3 &p) const; bool collinear_has_on(const Point_3 &p) const; diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Tetrahedron_3.h b/Cartesian_kernel/include/CGAL/Cartesian/Tetrahedron_3.h index 3a197adecf8..c20733313af 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Tetrahedron_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Tetrahedron_3.h @@ -45,7 +45,7 @@ public: TetrahedronC3(const Point_3 &p, const Point_3 &q, const Point_3 &r, const Point_3 &s) - : base(CGAL::make_array(p, q, r, s)) {} + : base{p, q, r, s} {} const Point_3 & vertex(int i) const; const Point_3 & operator[](int i) const; diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Triangle_2.h b/Cartesian_kernel/include/CGAL/Cartesian/Triangle_2.h index 5639f2363c4..48661cb5964 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Triangle_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Triangle_2.h @@ -41,7 +41,7 @@ public: TriangleC2() {} TriangleC2(const Point_2 &p, const Point_2 &q, const Point_2 &r) - : base(CGAL::make_array(p, q, r)) {} + : base{p, q, r} {} const Point_2 & diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Triangle_3.h b/Cartesian_kernel/include/CGAL/Cartesian/Triangle_3.h index 1fa2525ae10..7e61db2dee2 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Triangle_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Triangle_3.h @@ -42,7 +42,7 @@ public: TriangleC3() {} TriangleC3(const Point_3 &p, const Point_3 &q, const Point_3 &r) - : base(CGAL::make_array(p, q, r)) {} + : base{p, q, r} {} bool operator==(const TriangleC3 &t) const; bool operator!=(const TriangleC3 &t) const; diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Vector_2.h b/Cartesian_kernel/include/CGAL/Cartesian/Vector_2.h index 939e80c0c2a..1ff9d12ee7b 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Vector_2.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Vector_2.h @@ -50,10 +50,10 @@ public: VectorC2() {} VectorC2(const FT &x, const FT &y) - : base(CGAL::make_array(x, y)) {} + : base{x, y} {} VectorC2(FT&& x, FT&& y) - : base(CGAL::fwd_make_array(std::move(x), std::move(y))) {} + : base{std::move(x), std::move(y)} {} VectorC2(const FT &hx, const FT &hy, const FT &hw) : base( hw != FT(1) ? CGAL::make_array(hx/hw, hy/hw) diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Vector_3.h b/Cartesian_kernel/include/CGAL/Cartesian/Vector_3.h index f6563db5b7a..89540fd9b0d 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Vector_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Vector_3.h @@ -65,10 +65,10 @@ public: { *this = R().construct_vector_3_object()(l); } VectorC3(const FT_ &x, const FT_ &y, const FT_ &z) - : base(CGAL::make_array(x, y, z)) {} + : base{x, y, z} {} VectorC3(FT_&& x, FT_&& y, FT_&& z) - : base(CGAL::make_array(std::move(x), std::move(y), std::move(z))) {} + : base{std::move(x), std::move(y), std::move(z)} {} VectorC3(const FT_ &x, const FT_ &y, const FT_ &z, const FT_ &w) : base( w != FT_(1) ? CGAL::make_array(x/w, y/w, z/w) diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/DirectionH2.h b/Homogeneous_kernel/include/CGAL/Homogeneous/DirectionH2.h index a86847f9e87..b30267cf7d2 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/DirectionH2.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/DirectionH2.h @@ -56,7 +56,7 @@ public: DirectionH2() {} DirectionH2(const RT& x, const RT& y) - : base(CGAL::make_array(x, y, RT(1))) {} + : base{x, y, RT(1)} {} // TODO Not documented : should not exist, not used. // we should also change array -> array diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/Iso_cuboidH3.h b/Homogeneous_kernel/include/CGAL/Homogeneous/Iso_cuboidH3.h index 0119260a3c1..e4830033289 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/Iso_cuboidH3.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/Iso_cuboidH3.h @@ -43,7 +43,7 @@ public: Iso_cuboidH3() {} Iso_cuboidH3(const Point_3& p, const Point_3& q, int) - : base(CGAL::make_array(p, q)) + : base{p, q} { CGAL_kernel_assertion(p.x()<=q.x()); CGAL_kernel_assertion(p.y()<=q.y()); @@ -173,8 +173,8 @@ CGAL_KERNEL_LARGE_INLINE Iso_cuboidH3:: Iso_cuboidH3(const RT& min_hx, const RT& min_hy, const RT& min_hz, const RT& max_hx, const RT& max_hy, const RT& max_hz) - : base(CGAL::make_array(Point_3(min_hx, min_hy, min_hz, RT(1)), - Point_3(max_hx, max_hy, max_hz, RT(1)))) + : base{Point_3(min_hx, min_hy, min_hz, RT(1)), + Point_3(max_hx, max_hy, max_hz, RT(1))} {} template < class R > diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/Iso_rectangleH2.h b/Homogeneous_kernel/include/CGAL/Homogeneous/Iso_rectangleH2.h index 5c3f1ba9d32..6bdde3dec91 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/Iso_rectangleH2.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/Iso_rectangleH2.h @@ -42,7 +42,7 @@ public: Iso_rectangleH2() {} Iso_rectangleH2(const Point_2& p, const Point_2& q, int) - : base(CGAL::make_array(p, q)) + : base{p, q} { // I have to remove the assertions, because of Homogeneous_converter. // CGAL_kernel_assertion(p.x()<=q.x()); diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/LineH2.h b/Homogeneous_kernel/include/CGAL/Homogeneous/LineH2.h index 5f37cfee985..ab69b965f35 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/LineH2.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/LineH2.h @@ -45,7 +45,7 @@ public: LineH2() {} LineH2(const RT& a, const RT& b, const RT& c) - : base(CGAL::make_array(a, b, c)) {} + : base{a, b, c} {} bool operator==(const LineH2& l) const; bool operator!=(const LineH2& l) const; diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH3.h b/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH3.h index aecd718d41a..56a0e2b9ad8 100644 --- a/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH3.h +++ b/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH3.h @@ -63,7 +63,7 @@ public: { *this = R().construct_vector_3_object()(l); } VectorH3(const Null_vector&) - : base(CGAL::make_array(RT(0), RT(0), RT(0), RT(1))) {} + : base{RT(0), RT(0), RT(0), RT(1)} {} template < typename Tx, typename Ty, typename Tz > VectorH3(const Tx & x, const Ty & y, const Tz & z, diff --git a/STL_Extension/include/CGAL/Handle_for.h b/STL_Extension/include/CGAL/Handle_for.h index 2f05c6be1ce..9384277f7ae 100644 --- a/STL_Extension/include/CGAL/Handle_for.h +++ b/STL_Extension/include/CGAL/Handle_for.h @@ -42,7 +42,7 @@ class Handle_for T t; std::atomic_uint count; template - RefCounted(U&&...u ) : t(std::forward(u)...), count(1) {} + RefCounted(U&&...u ) : t{std::forward(u)...}, count(1) {} };