From a482f4f3a9dc8ae050a9b50b730fc0789fb74bf7 Mon Sep 17 00:00:00 2001 From: Michael Seel Date: Mon, 16 Jul 2001 12:09:07 +0000 Subject: [PATCH] replaced Hash_map --- Packages/Kernel_d/include/CGAL/Convex_hull_d.h | 6 +++--- .../include/CGAL/Convex_hull_d_to_polyhedron_3.h | 2 +- Packages/Kernel_d/include/CGAL/Delaunay_d.h | 14 +++++++------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Packages/Kernel_d/include/CGAL/Convex_hull_d.h b/Packages/Kernel_d/include/CGAL/Convex_hull_d.h index f9a6119c30f..5251669a946 100644 --- a/Packages/Kernel_d/include/CGAL/Convex_hull_d.h +++ b/Packages/Kernel_d/include/CGAL/Convex_hull_d.h @@ -78,7 +78,7 @@ Let |j = C.index_of_vertex_in_opposite_facet(f,i)|. Then |i = C.index_of_vertex_in_opposite_facet(g,j)|.}*/ #include -#include +#include #ifndef _MSC_VER #include #else @@ -500,7 +500,7 @@ public: all_pnts_.insert(all_pnts_.end(),first,last); int dcur = current_dimension(); - Hash_map > PointsOf; + Unique_hash_map > PointsOf; std::list FacetCandidates; typename R::Oriented_side_d side_of = kernel().oriented_side_d_object(); @@ -685,7 +685,7 @@ public: |void operator()(Facet_handle) const|}*/ { if (current_dimension() > 1) { - Hash_map visited(false); + Unique_hash_map visited(false); std::list candidates; candidates.push_back(start_facet_); visited[start_facet_] = true; diff --git a/Packages/Kernel_d/include/CGAL/Convex_hull_d_to_polyhedron_3.h b/Packages/Kernel_d/include/CGAL/Convex_hull_d_to_polyhedron_3.h index 4eb8c9a6a34..9d41e50d5fe 100644 --- a/Packages/Kernel_d/include/CGAL/Convex_hull_d_to_polyhedron_3.h +++ b/Packages/Kernel_d/include/CGAL/Convex_hull_d_to_polyhedron_3.h @@ -55,7 +55,7 @@ void operator()(HDS& hds ) ch.number_of_facets() ); // would be nice to have statistical data on // Chull available other than print_statistics() - Hash_map index( -1); + Unique_hash_map index( -1); std::list L = ch.all_facets(); typename std::list::iterator fit; Facet_handle f; diff --git a/Packages/Kernel_d/include/CGAL/Delaunay_d.h b/Packages/Kernel_d/include/CGAL/Delaunay_d.h index df7a57873b5..36f7239089a 100644 --- a/Packages/Kernel_d/include/CGAL/Delaunay_d.h +++ b/Packages/Kernel_d/include/CGAL/Delaunay_d.h @@ -91,7 +91,7 @@ the nearest site triangulation and the test the furthest site triangulation. }*/ -#include +#include #include CGAL_BEGIN_NAMESPACE @@ -492,7 +492,7 @@ public: void all_vertices_below(const Lifted_hyperplane_d& h, Simplex_handle s, std::list& result, - Hash_map& is_new, + Unique_hash_map& is_new, bool is_cocircular) const; @@ -617,8 +617,8 @@ void Delaunay_d::project(Regular_complex_d& RC, int which) const { RC.clear(dimension()); Delaunay_voronoi_kind k = (which == -1 ? NEAREST : FURTHEST); - Hash_map project_simps; - Hash_map project_verts; + Unique_hash_map project_simps; + Unique_hash_map project_verts; int dc = current_dimension(); RC.set_current_dimension(dc); @@ -923,7 +923,7 @@ void Delaunay_d:: all_vertices_below(const Lifted_hyperplane_d& h, Simplex_handle s, std::list< Vertex_handle >& result, - Hash_map& is_new, + Unique_hash_map& is_new, bool is_cocircular) const { visited_mark(s) = true; @@ -969,7 +969,7 @@ range_search(const Sphere_d& C) const } Simplex_handle s = simplex(v); bool is_cocircular = const_cast(this)->is_S_cocircular(); - Hash_map is_new(true); + Unique_hash_map is_new(true); int d = dimension(); std::vector P(d + 1); typename Lifted_R::Lift_to_paraboloid_d lift = @@ -1038,7 +1038,7 @@ std::list< CGAL_TYPENAME_MSVC_NULL Delaunay_d::Vertex_handle > Delaunay_d:: all_vertices(Delaunay_voronoi_kind k) const { - Hash_map is_new_vertex(true); + Unique_hash_map is_new_vertex(true); std::list result; std::list hull_simplices = all_simplices(k); typename std::list::iterator it;