Skip to content

Commit 4ffc949

Browse files
committed
replace boost::unordered by std::unordered
but in T3, Mesh_3, TDS_3, P3[TM]3
1 parent 77e5bee commit 4ffc949

File tree

84 files changed

+390
-323
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+390
-323
lines changed

Alpha_shapes_3/examples/Alpha_shapes_3/visible_alpha_shape_facets_to_OFF.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
#include <fstream>
99
#include <vector>
1010

11-
#include <boost/unordered_set.hpp>
12-
#include <boost/unordered_map.hpp>
11+
#include <unordered_set>
12+
#include <unordered_map>
1313

1414
typedef CGAL::Exact_predicates_inexact_constructions_kernel Gt;
1515

@@ -48,7 +48,7 @@ int main()
4848

4949
// collect alpha-shape facets accessible from the infinity
5050
// marks the cells that are in the same component as the infinite vertex by flooding
51-
boost::unordered_set< Alpha_shape_3::Cell_handle > marked_cells;
51+
std::unordered_set< Alpha_shape_3::Cell_handle > marked_cells;
5252
std::vector< Alpha_shape_3::Cell_handle > queue;
5353
queue.push_back( as.infinite_cell() );
5454

@@ -86,7 +86,7 @@ int main()
8686

8787
// dump into OFF format
8888
// assign an id per vertex
89-
boost::unordered_map< Alpha_shape_3::Vertex_handle, std::size_t> vids;
89+
std::unordered_map< Alpha_shape_3::Vertex_handle, std::size_t> vids;
9090
points.clear();
9191

9292
for(Alpha_shape_3::Facet f : filtered_regular_facets)

Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_overlay_ss_visitor.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@
2424

2525
#include <boost/variant.hpp>
2626
#include <boost/optional.hpp>
27-
#include <boost/unordered_map.hpp>
2827
#include <boost/variant/apply_visitor.hpp>
2928

29+
#include <unordered_map>
30+
3031
#include <CGAL/Arr_tags.h>
3132
#include <CGAL/Surface_sweep_2/Arr_construction_ss_visitor.h>
3233
#include <CGAL/Unique_hash_map.h>
@@ -114,7 +115,7 @@ class Arr_overlay_ss_visitor :
114115
Halfedge_map;
115116

116117
typedef std::pair<Cell_handle_red, Cell_handle_blue> Handle_info;
117-
typedef boost::unordered_map<Vertex_handle, Handle_info, Handle_hash_function>
118+
typedef std::unordered_map<Vertex_handle, Handle_info, Handle_hash_function>
118119
Vertex_map;
119120

120121
// Side categoties:

BGL/examples/BGL_LCC/copy_lcc.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include <iostream>
1212
#include <fstream>
1313
#include <iterator>
14-
#include <boost/unordered_map.hpp>
14+
#include <unordered_map>
1515

1616
typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel;
1717

@@ -50,8 +50,8 @@ int main(int argc, char* argv[])
5050
typedef boost::graph_traits<Source>::vertex_descriptor tm_vertex_descriptor;
5151
typedef boost::graph_traits<Source>::halfedge_descriptor tm_halfedge_descriptor;
5252

53-
boost::unordered_map<source_vertex_descriptor, tm_vertex_descriptor> v2v;
54-
boost::unordered_map<source_halfedge_descriptor, tm_halfedge_descriptor> h2h;
53+
std::unordered_map<source_vertex_descriptor, tm_vertex_descriptor> v2v;
54+
std::unordered_map<source_halfedge_descriptor, tm_halfedge_descriptor> h2h;
5555

5656
CGAL::copy_face_graph(T1, S, CGAL::parameters::vertex_to_vertex_output_iterator(std::inserter(v2v, v2v.end()))
5757
.halfedge_to_halfedge_output_iterator(std::inserter(h2h, h2h.end())));

BGL/examples/BGL_graphcut/face_selection_borders_regularization_example.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ int main(int argc, char** argv)
2323
Mesh mesh;
2424
CGAL::IO::read_OFF (in, mesh);
2525

26-
boost::unordered_map<Face_index, bool> is_selected_map;
26+
std::unordered_map<Face_index, bool> is_selected_map;
2727

2828
// randomly select 1/3 of faces
2929
std::size_t nb_selected_before = 0;

BGL/examples/BGL_polyhedron_3/copy_polyhedron.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <fstream>
1717
#include <iterator>
1818

19-
#include <boost/unordered_map.hpp>
19+
#include <unordered_map>
2020

2121

2222
typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel;
@@ -56,9 +56,9 @@ int main(int argc, char* argv[])
5656
typedef boost::graph_traits<Target2>::face_descriptor tm_face_descriptor;
5757

5858
// Use an unordered_map to keep track of elements.
59-
boost::unordered_map<sm_vertex_descriptor, tm_vertex_descriptor> v2v;
60-
boost::unordered_map<sm_halfedge_descriptor, tm_halfedge_descriptor> h2h;
61-
boost::unordered_map<sm_face_descriptor, tm_face_descriptor> f2f;
59+
std::unordered_map<sm_vertex_descriptor, tm_vertex_descriptor> v2v;
60+
std::unordered_map<sm_halfedge_descriptor, tm_halfedge_descriptor> h2h;
61+
std::unordered_map<sm_face_descriptor, tm_face_descriptor> f2f;
6262

6363
CGAL::copy_face_graph(S, T2, CGAL::parameters::vertex_to_vertex_output_iterator(std::inserter(v2v, v2v.end()))
6464
.halfedge_to_halfedge_output_iterator(std::inserter(h2h, h2h.end()))
@@ -83,9 +83,9 @@ int main(int argc, char* argv[])
8383
typedef boost::graph_traits<Source>::face_descriptor tm_face_descriptor;
8484

8585

86-
boost::unordered_map<source_vertex_descriptor, tm_vertex_descriptor> v2v;
87-
boost::unordered_map<source_halfedge_descriptor, tm_halfedge_descriptor> h2h;
88-
boost::unordered_map<source_face_descriptor, tm_face_descriptor> f2f;
86+
std::unordered_map<source_vertex_descriptor, tm_vertex_descriptor> v2v;
87+
std::unordered_map<source_halfedge_descriptor, tm_halfedge_descriptor> h2h;
88+
std::unordered_map<source_face_descriptor, tm_face_descriptor> f2f;
8989
CGAL::copy_face_graph(T1, S, CGAL::parameters::vertex_to_vertex_map(boost::make_assoc_property_map(v2v))
9090
.halfedge_to_halfedge_output_iterator(std::inserter(h2h, h2h.end()))
9191
.face_to_face_map(boost::make_assoc_property_map(f2f)));

BGL/include/CGAL/boost/graph/Face_filtered_graph.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
#include <boost/graph/graph_traits.hpp>
2727
#include <boost/iterator/filter_iterator.hpp>
2828
#include <boost/range/has_range_iterator.hpp>
29-
#include <boost/unordered_set.hpp>
3029

30+
#include <unordered_set>
3131
#include <bitset>
3232
#include <utility>
3333
#include <vector>
@@ -486,8 +486,8 @@ struct Face_filtered_graph
486486
selected_halfedges.reset();
487487

488488
typedef typename boost::property_traits<FacePatchIndexMap>::value_type Patch_index;
489-
boost::unordered_set<Patch_index> pids(boost::begin(selected_face_patch_indices),
490-
boost::end(selected_face_patch_indices));
489+
std::unordered_set<Patch_index> pids(boost::begin(selected_face_patch_indices),
490+
boost::end(selected_face_patch_indices));
491491

492492
for(face_descriptor fd : faces(_graph) )
493493
{
@@ -625,8 +625,8 @@ struct Face_filtered_graph
625625
// In that case, we will find a non-visited halfedge that has for target a vertex
626626
// that is already visited.
627627

628-
boost::unordered_set<vertex_descriptor> vertices_visited;
629-
boost::unordered_set<halfedge_descriptor> halfedges_handled;
628+
std::unordered_set<vertex_descriptor> vertices_visited;
629+
std::unordered_set<halfedge_descriptor> halfedges_handled;
630630

631631
for(halfedge_descriptor hd : halfedges(*this))
632632
{

BGL/include/CGAL/boost/graph/Seam_mesh.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
#include <CGAL/Unique_hash_map.h>
2222

2323
#include <boost/iterator/iterator_facade.hpp>
24-
#include <boost/unordered_set.hpp>
2524

25+
#include <unordered_set>
2626
#include <fstream>
2727
#include <functional>
2828
#include <iostream>

BGL/include/CGAL/boost/graph/copy_face_graph.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,11 @@
2323
#include <CGAL/Named_function_parameters.h>
2424
#include <CGAL/boost/graph/named_params_helper.h>
2525
#include <CGAL/property_map.h>
26-
#include <boost/unordered_map.hpp>
2726
#include <boost/utility/enable_if.hpp>
2827
#include <boost/iterator/function_output_iterator.hpp>
2928

29+
#include <unordered_map>
30+
3031
namespace CGAL {
3132

3233
namespace internal {

BGL/include/CGAL/boost/graph/selection.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
#include <boost/graph/graph_traits.hpp>
1616
#include <CGAL/boost/graph/iterator.h>
17-
#include <boost/unordered_set.hpp>
1817

1918
#include <CGAL/boost/graph/Dual.h>
2019
#include <boost/graph/filtered_graph.hpp>
@@ -23,6 +22,8 @@
2322
#include <CGAL/boost/graph/alpha_expansion_graphcut.h>
2423
#include <CGAL/squared_distance_3.h>
2524

25+
#include <unordered_set>
26+
2627
namespace CGAL {
2728

2829

@@ -1037,7 +1038,7 @@ void expand_face_selection_for_removal(const FaceRange& faces_to_be_deleted,
10371038
typedef typename boost::graph_traits<TriangleMesh>::face_descriptor face_descriptor;
10381039
typedef typename boost::graph_traits<TriangleMesh>::halfedge_descriptor halfedge_descriptor;
10391040

1040-
boost::unordered_set<vertex_descriptor> vertices_queue;
1041+
std::unordered_set<vertex_descriptor> vertices_queue;
10411042

10421043
// collect vertices belonging to at least a triangle that will be removed
10431044
for(face_descriptor fd : faces_to_be_deleted)
@@ -1130,8 +1131,8 @@ int euler_characteristic_of_selection(const FaceRange& face_selection,
11301131
typedef typename boost::graph_traits<PolygonMesh>::face_descriptor face_descriptor;
11311132
typedef typename boost::graph_traits<PolygonMesh>::halfedge_descriptor halfedge_descriptor;
11321133
typedef typename boost::graph_traits<PolygonMesh>::edge_descriptor edge_descriptor;
1133-
boost::unordered_set<vertex_descriptor> sel_vertices;
1134-
boost::unordered_set<edge_descriptor> sel_edges;
1134+
std::unordered_set<vertex_descriptor> sel_vertices;
1135+
std::unordered_set<edge_descriptor> sel_edges;
11351136
for(face_descriptor f : face_selection)
11361137
{
11371138
for(halfedge_descriptor h : halfedges_around_face(halfedge(f, pm), pm))

BGL/test/BGL/test_Face_filtered_graph.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
#include "test_Prefix.h"
77

88
#include <boost/numeric/conversion/cast.hpp>
9-
#include <boost/unordered_set.hpp>
10-
#include <boost/unordered_map.hpp>
119

10+
#include <unordered_map>
11+
#include <unordered_set>
1212
#include <fstream>
1313
#include <map>
1414
#include <memory>
1515
#include <utility>
1616
#include <cassert>
1717

18-
typedef boost::unordered_set<std::size_t> id_map;
18+
typedef std::unordered_set<std::size_t> id_map;
1919

2020
namespace PMP = CGAL::Polygon_mesh_processing;
2121

@@ -25,7 +25,7 @@ void test_halfedge_around_vertex_iterator(const Graph& g)
2525
typedef typename boost::graph_traits<Graph>::face_descriptor g_face_descriptor;
2626
typedef CGAL::Face_filtered_graph<Graph> Adapter;
2727
CGAL_GRAPH_TRAITS_MEMBERS(Adapter);
28-
boost::unordered_map<g_face_descriptor, std::size_t> map(num_faces(g));
28+
std::unordered_map<g_face_descriptor, std::size_t> map(num_faces(g));
2929
PMP::connected_components(g, boost::make_assoc_property_map(map));
3030

3131
Adapter fg(g, 0, boost::make_assoc_property_map(map));
@@ -526,7 +526,7 @@ int main()
526526
*sm, fccmap, CGAL::parameters::edge_is_constrained_map(Constraint<SM, SM::Property_map<boost::graph_traits<SM>::vertex_descriptor,
527527
SM::Point> >(*sm, positions)));
528528

529-
boost::unordered_set<long unsigned int> pids;
529+
std::unordered_set<long unsigned int> pids;
530530
pids.insert(0);
531531
pids.insert(2);
532532
SM_Adapter sm_adapter(*sm, pids, fccmap);

0 commit comments

Comments
 (0)