From ac0779b92b2e1c36959a745ddd7a1b92b2a945d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Tue, 12 Jun 2018 16:06:25 +0200 Subject: [PATCH 1/3] Removed erroneous documentation about translation of weighted points --- Kernel_23/doc/Kernel_23/CGAL/Weighted_point_2.h | 10 ---------- Kernel_23/doc/Kernel_23/CGAL/Weighted_point_3.h | 10 ---------- 2 files changed, 20 deletions(-) diff --git a/Kernel_23/doc/Kernel_23/CGAL/Weighted_point_2.h b/Kernel_23/doc/Kernel_23/CGAL/Weighted_point_2.h index 92e9fc8e70f..34121ab0e4d 100644 --- a/Kernel_23/doc/Kernel_23/CGAL/Weighted_point_2.h +++ b/Kernel_23/doc/Kernel_23/CGAL/Weighted_point_2.h @@ -101,16 +101,6 @@ public: */ bool operator!=(const Weighted_point_2 &q) const; - /*! - translates the point by the vector `v`. - */ - Weighted_point_2& operator+=(const Vector_2 &v); - - /*! - translates the point by the vector -`v`. - */ - Weighted_point_2& operator-=(const Vector_2 &v); - /// @} /// \name Coordinate Access diff --git a/Kernel_23/doc/Kernel_23/CGAL/Weighted_point_3.h b/Kernel_23/doc/Kernel_23/CGAL/Weighted_point_3.h index 299f8c6bbc8..24b273a5a8d 100644 --- a/Kernel_23/doc/Kernel_23/CGAL/Weighted_point_3.h +++ b/Kernel_23/doc/Kernel_23/CGAL/Weighted_point_3.h @@ -101,16 +101,6 @@ public: */ bool operator!=(const Weighted_point_3 &q) const; - /*! - translates the point by the vector `v`. - */ - Weighted_point_3& operator+=(const Vector_3 &v); - - /*! - translates the point by the vector -`v`. - */ - Weighted_point_3& operator-=(const Vector_3 &v); - /// @} /// \name Coordinate Access From 1090fec586954ca394c49f636d6ffa6375dc694f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Wed, 13 Jun 2018 10:35:22 +0200 Subject: [PATCH 2/3] Removed weird sentence in (weighted_)points bbox()'s doc --- Kernel_23/doc/Kernel_23/CGAL/Point_2.h | 3 +-- Kernel_23/doc/Kernel_23/CGAL/Weighted_point_2.h | 3 +-- Kernel_23/doc/Kernel_23/CGAL/Weighted_point_3.h | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Kernel_23/doc/Kernel_23/CGAL/Point_2.h b/Kernel_23/doc/Kernel_23/CGAL/Point_2.h index b18c6b4c8d7..e304a259393 100644 --- a/Kernel_23/doc/Kernel_23/CGAL/Point_2.h +++ b/Kernel_23/doc/Kernel_23/CGAL/Point_2.h @@ -196,8 +196,7 @@ returns the dimension (the constant 2). int dimension() const; /*! -returns a bounding box containing `p`. Note that bounding boxes -are not parameterized with whatsoever. +returns a bounding box containing `p`. */ Bbox_2 bbox() const; diff --git a/Kernel_23/doc/Kernel_23/CGAL/Weighted_point_2.h b/Kernel_23/doc/Kernel_23/CGAL/Weighted_point_2.h index 34121ab0e4d..620f63ae66c 100644 --- a/Kernel_23/doc/Kernel_23/CGAL/Weighted_point_2.h +++ b/Kernel_23/doc/Kernel_23/CGAL/Weighted_point_2.h @@ -180,8 +180,7 @@ public: int dimension() const; /*! - returns a bounding box containing `p`. Note that bounding boxes - are not parameterized with whatsoever. + returns a bounding box containing `p`. */ Bbox_2 bbox() const; diff --git a/Kernel_23/doc/Kernel_23/CGAL/Weighted_point_3.h b/Kernel_23/doc/Kernel_23/CGAL/Weighted_point_3.h index 24b273a5a8d..7a15de8755a 100644 --- a/Kernel_23/doc/Kernel_23/CGAL/Weighted_point_3.h +++ b/Kernel_23/doc/Kernel_23/CGAL/Weighted_point_3.h @@ -190,8 +190,7 @@ public: int dimension() const; /*! - returns a bounding box containing `p`. Note that bounding boxes - are not parameterized with whatsoever. + returns a bounding box containing `p`. */ Bbox_3 bbox() const; From d4011f3f1fa5d06e635f89bb2e963c937a98884a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Wed, 13 Jun 2018 10:37:24 +0200 Subject: [PATCH 3/3] Fixed result_of function signature --- Kernel_23/include/CGAL/Weighted_point_3.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Kernel_23/include/CGAL/Weighted_point_3.h b/Kernel_23/include/CGAL/Weighted_point_3.h index f78f779eec1..f3c705beda2 100644 --- a/Kernel_23/include/CGAL/Weighted_point_3.h +++ b/Kernel_23/include/CGAL/Weighted_point_3.h @@ -91,62 +91,62 @@ public: : Rep(typename R::Construct_weighted_point_3()(Return_base_tag(), x, y, z)) {} - typename cpp11::result_of::type + typename cpp11::result_of::type point() const { return typename R::Construct_point_3()(*this); } - typename cpp11::result_of::type + typename cpp11::result_of::type weight() const { return typename R::Compute_weight_3()(*this); } - typename cpp11::result_of::type + typename cpp11::result_of::type x() const { return typename R::Compute_x_3()(point()); } - typename cpp11::result_of::type + typename cpp11::result_of::type y() const { return typename R::Compute_y_3()(point()); } - typename cpp11::result_of::type + typename cpp11::result_of::type z() const { return typename R::Compute_z_3()(point()); } - typename cpp11::result_of::type + typename cpp11::result_of::type hx() const { return R().compute_hx_3_object()(point()); } - typename cpp11::result_of::type + typename cpp11::result_of::type hy() const { return R().compute_hy_3_object()(point()); } - typename cpp11::result_of::type + typename cpp11::result_of::type hz() const { return R().compute_hz_3_object()(point()); } - typename cpp11::result_of::type + typename cpp11::result_of::type hw() const { return R().compute_hw_3_object()(point()); } - typename cpp11::result_of::type + typename cpp11::result_of::type cartesian(int i) const { CGAL_kernel_precondition( (i == 0) || (i == 1) || (i == 2) ); @@ -165,7 +165,7 @@ public: return hw(); } - typename cpp11::result_of::type + typename cpp11::result_of::type operator[](int i) const { return cartesian(i);