From 2099041a3081cf12be5bd7cfb722e9fdd9b3f5e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Tue, 4 Apr 2017 16:31:31 +0200 Subject: [PATCH] Fixed missing typedef and removed some warnings due to unused typedefs --- Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h | 41 +++++++++---------- .../Mesh_3/mesh_standard_facet_criteria.h | 4 -- .../include/CGAL/Mesh_3/vertex_perturbation.h | 3 +- 3 files changed, 21 insertions(+), 27 deletions(-) diff --git a/Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h b/Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h index ce8c1cc3291..b3e5fe598d6 100644 --- a/Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h +++ b/Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h @@ -377,33 +377,33 @@ class Slivers_exuder public: // Types - typedef typename C3T3::Concurrency_tag Concurrency_tag; + typedef typename C3T3::Concurrency_tag Concurrency_tag; typedef Slivers_exuder_base< - typename C3T3::Triangulation, Concurrency_tag> Base; + typename C3T3::Triangulation, Concurrency_tag> Base; private: // Types typedef Slivers_exuder Self; - typedef typename C3T3::Triangulation Tr; - typedef typename Tr::Weighted_point Weighted_point; - typedef typename Tr::Bare_point Bare_point; - typedef typename Tr::Cell_handle Cell_handle; - typedef typename Tr::Facet Facet; - typedef typename Tr::Vertex_handle Vertex_handle; - typedef typename Weighted_point::Weight Weight; - typedef typename Base::Queue_value_type Queue_value_type; - typedef typename Base::Cell_vector Cell_vector; + typedef typename C3T3::Triangulation Tr; + typedef typename Tr::Weighted_point Weighted_point; + typedef typename Tr::Bare_point Bare_point; + typedef typename Tr::Cell_handle Cell_handle; + typedef typename Tr::Facet Facet; + typedef typename Tr::Vertex_handle Vertex_handle; + typedef typename Weighted_point::Weight Weight; + typedef typename Base::Queue_value_type Queue_value_type; + typedef typename Base::Cell_vector Cell_vector; - typedef typename Tr::Geom_traits Geom_traits; - typedef typename Geom_traits::Tetrahedron_3 Tetrahedron_3; + typedef typename Tr::Geom_traits Gt; + typedef typename Gt::Tetrahedron_3 Tetrahedron_3; - typedef typename C3T3::Cells_in_complex_iterator Cell_iterator; - typedef std::vector Facet_vector; + typedef typename C3T3::Cells_in_complex_iterator Cell_iterator; + typedef std::vector Facet_vector; - typedef typename C3T3::Surface_patch_index Surface_patch_index; - typedef typename C3T3::Subdomain_index Subdomain_index; - typedef typename C3T3::Index Index; + typedef typename C3T3::Surface_patch_index Surface_patch_index; + typedef typename C3T3::Subdomain_index Subdomain_index; + typedef typename C3T3::Index Index; // Umbrella will store the surface_index of internal facets of a new // weighted point conflict zone. Such facets are represented by their edge @@ -622,7 +622,7 @@ private: double compute_critical_radius(const Vertex_handle& v, const Cell_handle& c) const { - typedef typename Geom_traits::Compute_power_distance_to_power_sphere_3 + typedef typename Gt::Compute_power_distance_to_power_sphere_3 Critical_radius; Critical_radius critical_radius = @@ -642,8 +642,7 @@ private: { double dist = (std::numeric_limits::max)(); - details::Min_distance_from_v - min_distance_from_v(vh, dist); + details::Min_distance_from_v min_distance_from_v(vh, dist); tr_.adjacent_vertices(vh, boost::make_function_output_iterator(min_distance_from_v)); diff --git a/Mesh_3/include/CGAL/Mesh_3/mesh_standard_facet_criteria.h b/Mesh_3/include/CGAL/Mesh_3/mesh_standard_facet_criteria.h index 38da5252a57..5fd9069e674 100644 --- a/Mesh_3/include/CGAL/Mesh_3/mesh_standard_facet_criteria.h +++ b/Mesh_3/include/CGAL/Mesh_3/mesh_standard_facet_criteria.h @@ -352,13 +352,10 @@ protected: CGAL_assertion (f.first->is_facet_on_surface(f.second)); typedef typename Tr::Geom_traits Gt; - typedef typename Tr::Weighted_point Weighted_point; typedef typename Tr::Bare_point Bare_point; typename Gt::Compute_squared_distance_3 distance = Gt().compute_squared_distance_3_object(); - typename Gt::Construct_point_3 cp = - Gt().construct_point_3_object(); typename Gt::Construct_point_3 wp2p = Gt().construct_point_3_object(); @@ -427,7 +424,6 @@ protected: CGAL_assertion (B_ != 0); typedef typename Tr::Geom_traits Gt; - typedef typename Tr::Weighted_point Weighted_point; typedef typename Tr::Bare_point Bare_point; typename Gt::Compute_squared_distance_3 distance = diff --git a/Mesh_3/include/CGAL/Mesh_3/vertex_perturbation.h b/Mesh_3/include/CGAL/Mesh_3/vertex_perturbation.h index 2f82639ce12..1a97f5d3ada 100644 --- a/Mesh_3/include/CGAL/Mesh_3/vertex_perturbation.h +++ b/Mesh_3/include/CGAL/Mesh_3/vertex_perturbation.h @@ -443,9 +443,8 @@ protected: bool *could_lock_zone = NULL) const { typedef typename C3T3::Triangulation::Geom_traits Gt; - typedef typename Gt::FT FT; + typedef typename Gt::FT FT; typedef typename C3T3::Triangulation::Bare_point Bare_point; - typedef typename C3T3::Triangulation::Weighted_point Weighted_point; typedef Triangulation_helpers Th; typename Gt::Compute_squared_length_3 sq_length =