From 1a9378f1a5a9dbba69a114ac798ef215158c0b1e Mon Sep 17 00:00:00 2001 From: G Yuvan Shankar Date: Wed, 19 Jan 2022 20:04:45 +0530 Subject: [PATCH] Minor changed --- .../Discrete_harmonic_coordinates_3.h | 8 ++++---- .../Mean_value_coordinates_3.h | 8 ++++---- .../Wachspress_coordinates_3.h | 10 +++++----- .../tetrahedron_coordinates.h | 12 ++++-------- 4 files changed, 17 insertions(+), 21 deletions(-) diff --git a/Barycentric_coordinates_3/include/CGAL/Barycentric_coordinates_3/Discrete_harmonic_coordinates_3.h b/Barycentric_coordinates_3/include/CGAL/Barycentric_coordinates_3/Discrete_harmonic_coordinates_3.h index a4fe5f3aab8..dd1a38c9eaf 100644 --- a/Barycentric_coordinates_3/include/CGAL/Barycentric_coordinates_3/Discrete_harmonic_coordinates_3.h +++ b/Barycentric_coordinates_3/include/CGAL/Barycentric_coordinates_3/Discrete_harmonic_coordinates_3.h @@ -70,13 +70,13 @@ namespace Barycentric_coordinates { /// \endcond /// Number type. - typedef typename GeomTraits::FT FT; + using FT = typename GeomTraits::FT; /// Point type. - typedef typename GeomTraits::Point_3 Point_3; + using Point_3 = typename GeomTraits::Point_3; - /// %Vector type. - typedef typename GeomTraits::Vector_3 Vector_3; + /// Vector type. + using Vector_3 = typename GeomTraits::Vector_3; /// @} diff --git a/Barycentric_coordinates_3/include/CGAL/Barycentric_coordinates_3/Mean_value_coordinates_3.h b/Barycentric_coordinates_3/include/CGAL/Barycentric_coordinates_3/Mean_value_coordinates_3.h index 56f1ba0eea4..24828614de2 100644 --- a/Barycentric_coordinates_3/include/CGAL/Barycentric_coordinates_3/Mean_value_coordinates_3.h +++ b/Barycentric_coordinates_3/include/CGAL/Barycentric_coordinates_3/Mean_value_coordinates_3.h @@ -71,13 +71,13 @@ namespace Barycentric_coordinates { /// \endcond /// Number type. - typedef typename GeomTraits::FT FT; + using FT = typename GeomTraits::FT; /// Point type. - typedef typename GeomTraits::Point_3 Point_3; + using Point_3 = GeomTraits::Point_3; - /// %Vector type. - typedef typename GeomTraits::Vector_3 Vector_3; + /// Vector type. + using Vector_3 = typename GeomTraits::Vector_3; /// @} diff --git a/Barycentric_coordinates_3/include/CGAL/Barycentric_coordinates_3/Wachspress_coordinates_3.h b/Barycentric_coordinates_3/include/CGAL/Barycentric_coordinates_3/Wachspress_coordinates_3.h index 43bee7d59f1..fd58a6ed60b 100644 --- a/Barycentric_coordinates_3/include/CGAL/Barycentric_coordinates_3/Wachspress_coordinates_3.h +++ b/Barycentric_coordinates_3/include/CGAL/Barycentric_coordinates_3/Wachspress_coordinates_3.h @@ -71,13 +71,13 @@ namespace Barycentric_coordinates { /// \endcond /// Number type. - typedef typename GeomTraits::FT FT; + using FT = typename GeomTraits::FT; /// Point type. - typedef typename GeomTraits::Point_3 Point_3; + using Point_3 = typename GeomTraits::Point_3; - /// %Vector type. - typedef typename GeomTraits::Vector_3 Vector_3; + /// Vector type. + using Vector_3 = typename GeomTraits::Vector_3; /// @} @@ -286,7 +286,7 @@ namespace Barycentric_coordinates { CGAL::Face_around_target_circulator done(face_circulator); - done--; done --; + done-=2; // Vector connecting query point to vertex; const Vector_3 query_vertex = m_construct_vector_3(query, vertex_val); diff --git a/Barycentric_coordinates_3/include/CGAL/Barycentric_coordinates_3/tetrahedron_coordinates.h b/Barycentric_coordinates_3/include/CGAL/Barycentric_coordinates_3/tetrahedron_coordinates.h index ebbf29aeb91..9dcbf4df9b8 100644 --- a/Barycentric_coordinates_3/include/CGAL/Barycentric_coordinates_3/tetrahedron_coordinates.h +++ b/Barycentric_coordinates_3/include/CGAL/Barycentric_coordinates_3/tetrahedron_coordinates.h @@ -79,8 +79,7 @@ namespace Barycentric_coordinates{ OutIterator c_begin, const GeomTraits& traits) { - return internal::tetrahedron_coordinates_impl( - p0, p1, p2, p3, query, c_begin, traits); + return internal::tetrahedron_coordinates_impl(p0, p1, p2, p3, query, c_begin, traits); } //return iterator(infer from point_3) @@ -97,8 +96,7 @@ namespace Barycentric_coordinates{ using GeomTraits = typename Kernel_traits::Kernel; const GeomTraits traits; - return tetrahedron_coordinates( - p0, p1, p2, p3, query, c_begin, traits); + return tetrahedron_coordinates(p0, p1, p2, p3, query, c_begin, traits); } /*! @@ -153,8 +151,7 @@ namespace Barycentric_coordinates{ using FT = typename GeomTraits::FT; std::vector coordinates; coordinates.reserve(4); - internal::tetrahedron_coordinates_impl( - p0, p1, p2, p3, query, std::back_inserter(coordinates), traits); + internal::tetrahedron_coordinates_impl(p0, p1, p2, p3, query, std::back_inserter(coordinates), traits); CGAL_assertion(coordinates.size() == 4); return {coordinates[0], coordinates[1], coordinates[2], coordinates[3]}; } @@ -171,8 +168,7 @@ namespace Barycentric_coordinates{ using GeomTraits = typename Kernel_traits::Kernel; const GeomTraits traits; - return tetrahedron_coordinates_in_array( - p0, p1, p2, p3, query, traits); + return tetrahedron_coordinates_in_array(p0, p1, p2, p3, query, traits); } }