diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Point_3.h b/Cartesian_kernel/include/CGAL/Cartesian/Point_3.h index 205a9af6346a..1bd80cdb016f 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Point_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Point_3.h @@ -45,11 +45,6 @@ class PointC3 PointC3(const FT &x, const FT &y, const FT &z) : base(x, y, z) {} - PointC3(FT &&x, FT &&y, FT &&z) - : base(std::forward(x), std::forward(y), std::forward(z)) - {} - - PointC3(const FT &x, const FT &y, const FT &z, const FT &w) : base(x, y, z, w) {} diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Vector_3.h b/Cartesian_kernel/include/CGAL/Cartesian/Vector_3.h index 55862b39bc87..5b03e8d0fb35 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/Vector_3.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/Vector_3.h @@ -65,10 +65,7 @@ class VectorC3 { *this = R().construct_vector_3_object()(l); } VectorC3(const FT_ &x, const FT_ &y, const FT_ &z) - : base(Rep{x, y, z}) {} - - VectorC3(FT_ &&x, FT_ &&y, FT_ &&z) - : base(Rep{x, y, z}) {} + : base(CGAL::make_array(x, y, 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/Cartesian_kernel/include/CGAL/Cartesian/function_objects.h b/Cartesian_kernel/include/CGAL/Cartesian/function_objects.h index effe3bf68a95..737a52dfc143 100644 --- a/Cartesian_kernel/include/CGAL/Cartesian/function_objects.h +++ b/Cartesian_kernel/include/CGAL/Cartesian/function_objects.h @@ -3160,10 +3160,6 @@ namespace CartesianKernelFunctors { operator()(Return_base_tag, const RT& x, const RT& y, const RT& z) const { return Rep(x, y, z); } - Rep // Point_3 - operator()(Return_base_tag, RT&& x, RT&& y, RT&& z) const - { return Rep(std::forward(x), std::forward(y), std::forward(z)); } - Rep // Point_3 operator()(Return_base_tag, const RT& x, const RT& y, const RT& z, const RT& w) const { return Rep(x, y, z, w); } @@ -3184,10 +3180,6 @@ namespace CartesianKernelFunctors { operator()(const RT& x, const RT& y, const RT& z) const { return Point_3(x, y, z); } - Point_3 - operator()(RT&& x, RT&& y, RT&& z) const - { return Point_3(std::forward(x), std::forward(y), std::forward(z)); } - Point_3 operator()(const RT& x, const RT& y, const RT& z, const RT& w) const { return Point_3(x, y, z, w); } diff --git a/Kernel_23/include/CGAL/Point_3.h b/Kernel_23/include/CGAL/Point_3.h index 613e9f20c5b1..f2444a9506c0 100644 --- a/Kernel_23/include/CGAL/Point_3.h +++ b/Kernel_23/include/CGAL/Point_3.h @@ -79,13 +79,6 @@ class Point_3 : public R_::Kernel_base::Point_3 : Rep(typename R::Construct_point_3()(Return_base_tag(), x, y, z)) {} - template < typename T1, typename T2, typename T3 > - Point_3(T1&& x, T2&& y, T3&& z) - : Rep(typename R::Construct_point_3()(Return_base_tag(), std::forward(x), - std::forward(y), - std::forward(z))) - {} - Point_3(const RT& hx, const RT& hy, const RT& hz, const RT& hw) : Rep(typename R::Construct_point_3()(Return_base_tag(), hx, hy, hz, hw)) {} @@ -290,7 +283,7 @@ extract(std::istream& is, Point_3& p, const Cartesian_tag&) break; } if (is) - p = Point_3(std::move(x), std::move(y), std::move(z)); + p = Point_3(x, y, z); return is; }