Skip to content

Commit

Permalink
Merge pull request #2955 from afabri/BGL-include_cleanup-GF
Browse files Browse the repository at this point in the history
Do not include some BGL related header files
  • Loading branch information
sloriot committed May 15, 2018
2 parents 962e9eb + aef93a1 commit 9938100
Show file tree
Hide file tree
Showing 84 changed files with 19 additions and 136 deletions.
2 changes: 1 addition & 1 deletion AABB_tree/test/AABB_tree/AABB_test_util.h
Expand Up @@ -29,7 +29,7 @@

#include <CGAL/AABB_face_graph_triangle_primitive.h>
#include <CGAL/AABB_halfedge_graph_segment_primitive.h>
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/Polyhedron_3.h>

#include <CGAL/disable_warnings.h>

Expand Down
1 change: 0 additions & 1 deletion AABB_tree/test/AABB_tree/aabb_any_all_benchmark.cpp
Expand Up @@ -15,7 +15,6 @@
#include <CGAL/AABB_traits.h>

#include <CGAL/AABB_face_graph_triangle_primitive.h>
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/Polyhedron_3.h>


Expand Down
Expand Up @@ -32,7 +32,6 @@
#include <CGAL/Simple_cartesian.h>
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>

#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/Polyhedron_3.h>

#include <CGAL/AABB_tree.h>
Expand Down
1 change: 0 additions & 1 deletion AABB_tree/test/AABB_tree/aabb_distance_edge_test.cpp
Expand Up @@ -33,7 +33,6 @@

#include <CGAL/AABB_tree.h>
#include <CGAL/AABB_traits.h>
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/Polyhedron_3.h>


Expand Down
Expand Up @@ -33,7 +33,6 @@

#include <CGAL/AABB_tree.h>
#include <CGAL/AABB_traits.h>
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/Polyhedron_3.h>


Expand Down
1 change: 0 additions & 1 deletion AABB_tree/test/AABB_tree/aabb_distance_triangle_test.cpp
Expand Up @@ -29,7 +29,6 @@

#include <CGAL/AABB_tree.h>
#include <CGAL/AABB_traits.h>
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/Polyhedron_3.h>

#include "AABB_test_util.h"
Expand Down
Expand Up @@ -32,7 +32,6 @@
#include <CGAL/Simple_cartesian.h>
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>

#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/Polyhedron_3.h>

#include <CGAL/AABB_tree.h>
Expand Down
Expand Up @@ -33,7 +33,6 @@
#include <CGAL/Simple_cartesian.h>
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>

#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/Polyhedron_3.h>

#include <CGAL/AABB_tree.h>
Expand Down
Expand Up @@ -35,7 +35,6 @@
#include <CGAL/Simple_cartesian.h>
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>

#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/Polyhedron_3.h>

#include <CGAL/AABB_tree.h>
Expand Down
Expand Up @@ -34,7 +34,6 @@
#include <CGAL/Simple_cartesian.h>
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>

#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/Polyhedron_3.h>

#include <CGAL/AABB_tree.h>
Expand Down
1 change: 0 additions & 1 deletion AABB_tree/test/AABB_tree/aabb_test_ray_intersection.cpp
Expand Up @@ -12,7 +12,6 @@

#include <CGAL/AABB_tree.h>
#include <CGAL/AABB_traits.h>
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/Polyhedron_3.h>
#include <CGAL/AABB_face_graph_triangle_primitive.h>
#include <CGAL/Timer.h>
Expand Down
2 changes: 0 additions & 2 deletions BGL/examples/BGL_LCC/copy_lcc.cpp
Expand Up @@ -2,8 +2,6 @@
#include <CGAL/Exact_predicates_exact_constructions_kernel.h>

#include <CGAL/Polyhedron_3.h>
#include <CGAL/IO/Polyhedron_iostream.h>
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>

#include <CGAL/boost/graph/graph_traits_Linear_cell_complex_for_combinatorial_map.h>

Expand Down
1 change: 0 additions & 1 deletion BGL/examples/BGL_LCC/transform_iterator_lcc.cpp
@@ -1,5 +1,4 @@
#include <CGAL/Simple_cartesian.h>
#include <CGAL/IO/Polyhedron_iostream.h>
#include <CGAL/boost/graph/graph_traits_Linear_cell_complex_for_combinatorial_map.h>
#include <CGAL/boost/graph/iterator.h>
#include <fstream>
Expand Down
1 change: 0 additions & 1 deletion BGL/include/CGAL/boost/graph/graph_traits_OpenMesh.h
Expand Up @@ -34,7 +34,6 @@
#include <CGAL/assertions.h>
#include <CGAL/hash_openmesh.h>


#if defined(BOOST_MSVC)
# pragma warning(push)
# pragma warning(disable:4267)
Expand Down
2 changes: 0 additions & 2 deletions BGL/test/BGL/borders.cpp
Expand Up @@ -2,8 +2,6 @@

#include <CGAL/Simple_cartesian.h>
#include <CGAL/Polyhedron_3.h>
#include <CGAL/IO/Polyhedron_iostream.h>
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/boost/graph/split_graph_into_polylines.h>
#include <CGAL/boost/graph/helpers.h>
#include <boost/graph/filtered_graph.hpp>
Expand Down
2 changes: 1 addition & 1 deletion BGL/test/BGL/graph_concept_Dual.cpp
@@ -1,5 +1,5 @@
#include <CGAL/Simple_cartesian.h>
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/Polyhedron_3.h>
#include <CGAL/boost/graph/graph_concepts.h>
#include <CGAL/Polyhedron_items_with_id_3.h>

Expand Down
3 changes: 1 addition & 2 deletions BGL/test/BGL/graph_concept_Gwdwg_Surface_mesh.cpp
@@ -1,5 +1,4 @@
#include <CGAL/boost/graph/graph_traits_Surface_mesh.h>
#include <CGAL/boost/graph/properties_Surface_mesh.h>
#include <CGAL/Surface_mesh.h>
#include <CGAL/Simple_cartesian.h>
#include <CGAL/boost/graph/Graph_with_descriptor_with_graph.h>

Expand Down
2 changes: 1 addition & 1 deletion BGL/test/BGL/graph_concept_Polyhedron_3.cpp
@@ -1,5 +1,5 @@
#include <CGAL/Simple_cartesian.h>
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/Polyhedron_3.h>
#include <CGAL/boost/graph/graph_concepts.h>
#include <CGAL/Polyhedron_items_with_id_3.h>

Expand Down
3 changes: 1 addition & 2 deletions BGL/test/BGL/graph_concept_Seam_mesh_Surface_mesh.cpp
@@ -1,5 +1,4 @@
#include <CGAL/boost/graph/graph_traits_Surface_mesh.h>
#include <CGAL/boost/graph/properties_Surface_mesh.h>
#include <CGAL/Surface_mesh.h>
#include <CGAL/boost/graph/Seam_mesh.h>
#include <CGAL/Simple_cartesian.h>

Expand Down
3 changes: 1 addition & 2 deletions BGL/test/BGL/graph_concept_Surface_mesh.cpp
@@ -1,5 +1,4 @@
#include <CGAL/boost/graph/graph_traits_Surface_mesh.h>
#include <CGAL/boost/graph/properties_Surface_mesh.h>
#include <CGAL/Surface_mesh.h>
#include <CGAL/Simple_cartesian.h>

#include <boost/graph/graph_concepts.hpp>
Expand Down
1 change: 0 additions & 1 deletion BGL/test/BGL/test_Manifold_face_removal.cpp
@@ -1,6 +1,5 @@
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Surface_mesh.h>
#include <CGAL/boost/graph/graph_traits_Surface_mesh.h>
#include <CGAL/Surface_mesh/IO.h>

#include <boost/unordered_map.hpp>
Expand Down
3 changes: 1 addition & 2 deletions BGL/test/BGL/test_bgl_read_write.cpp
@@ -1,10 +1,9 @@
#include <CGAL/Simple_cartesian.h>

#include <CGAL/Surface_mesh.h>
#include <CGAL/boost/graph/graph_traits_Surface_mesh.h>

#include <CGAL/Polyhedron_items_with_id_3.h>
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/Polyhedron_3.h>

#include <CGAL/Linear_cell_complex_for_bgl_combinatorial_map_helper.h>
#include <CGAL/boost/graph/graph_traits_Linear_cell_complex_for_combinatorial_map.h>
Expand Down
2 changes: 0 additions & 2 deletions BGL/test/BGL/test_circulator.cpp
@@ -1,7 +1,5 @@
#include <CGAL/Simple_cartesian.h>
#include <CGAL/Polyhedron_3.h>
#include <CGAL/IO/Polyhedron_iostream.h>
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/boost/graph/iterator.h>

#include <boost/foreach.hpp>
Expand Down
Expand Up @@ -5,7 +5,7 @@
#include <CGAL/point_generators_3.h>

#include <vector>
#include <CGAL/IO/Polyhedron_iostream.h>
#include <CGAL/Polyhedron_3.h>
#include <CGAL/Surface_mesh.h>


Expand Down
2 changes: 0 additions & 2 deletions Generalized_map/test/Generalized_map/Generalized_map_2_test.h
Expand Up @@ -24,9 +24,7 @@
#include <CGAL/Generalized_map_operations.h>
#include <CGAL/Random.h>

#include <CGAL/IO/Polyhedron_iostream.h>
#include <iostream>
#include <fstream>

using namespace std;

Expand Down
1 change: 0 additions & 1 deletion Generator/test/Generator/generic_random_test.cpp
Expand Up @@ -18,7 +18,6 @@
#include <CGAL/Triangulation_data_structure_2.h>
#include <CGAL/Triangulation_vertex_base_2.h>

#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/boost/graph/helpers.h>
#include <CGAL/point_generators_3.h>

Expand Down
1 change: 0 additions & 1 deletion Hash_map/test/Hash_map/Hash.cpp
Expand Up @@ -9,7 +9,6 @@
#include <CGAL/Linear_cell_complex_for_combinatorial_map.h>
#include <CGAL/Linear_cell_complex_for_generalized_map.h>
#include <CGAL/boost/graph/graph_traits_Arrangement_2.h>
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/boost/graph/graph_traits_Triangulation_2.h>
#include <map>
#include <boost/unordered_map.hpp>
Expand Down
Expand Up @@ -9,7 +9,7 @@

#include <CGAL/AABB_tree.h>
#include <CGAL/AABB_traits.h>
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/Polyhedron_3.h>
#include <CGAL/AABB_face_graph_triangle_primitive.h>
#include <CGAL/point_generators_3.h>

Expand Down
4 changes: 1 addition & 3 deletions Mesh_3/examples/Mesh_3/mesh_hybrid_mesh_domain.cpp
Expand Up @@ -7,13 +7,11 @@
#include <CGAL/Mesh_criteria_3.h>

#include <CGAL/Implicit_mesh_domain_3.h>
#include <CGAL/Polyhedron_3.h>
#include <CGAL/Polyhedral_mesh_domain_3.h>
#include <CGAL/Mesh_domain_with_polyline_features_3.h>
#include <CGAL/make_mesh_3.h>

// IO
#include <CGAL/IO/Polyhedron_iostream.h>

// Ouput
#include <CGAL/Mesh_3/Dump_c3t3.h>

Expand Down
2 changes: 1 addition & 1 deletion Mesh_3/test/Mesh_3/test_c3t3.cpp
Expand Up @@ -32,7 +32,7 @@
// IO
#include <fstream>
#include <iostream>
#include <CGAL/IO/Polyhedron_iostream.h>
#include <CGAL/Polyhedron_3.h>
#include <CGAL/IO/File_medit.h>
#include <CGAL/IO/File_tetgen.h>

Expand Down
1 change: 0 additions & 1 deletion Nef_3/examples/Nef_3/handling_double_coordinates.cpp
@@ -1,6 +1,5 @@
#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
#include <CGAL/Polyhedron_3.h>
#include <CGAL/IO/Polyhedron_iostream.h>
#include <CGAL/Nef_polyhedron_3.h>
#include <CGAL/IO/Nef_polyhedron_iostream_3.h>

Expand Down
1 change: 0 additions & 1 deletion Nef_3/examples/Nef_3/interface_polyhedron.cpp
@@ -1,7 +1,6 @@
#include <CGAL/Exact_integer.h>
#include <CGAL/Homogeneous.h>
#include <CGAL/Polyhedron_3.h>
#include <CGAL/IO/Polyhedron_iostream.h>
#include <CGAL/Nef_polyhedron_3.h>
#include <CGAL/IO/Nef_polyhedron_iostream_3.h>
#include <iostream>
Expand Down
1 change: 0 additions & 1 deletion Nef_3/examples/Nef_3/offIO.cpp
@@ -1,7 +1,6 @@
#include <CGAL/Exact_integer.h>
#include <CGAL/Homogeneous.h>
#include <CGAL/Polyhedron_3.h>
#include <CGAL/IO/Polyhedron_iostream.h>
#include <CGAL/Nef_polyhedron_3.h>
#include <CGAL/IO/Nef_polyhedron_iostream_3.h>
#include <iostream>
Expand Down
1 change: 0 additions & 1 deletion Nef_3/test/Nef_3/nef_union_error_llvm.cpp
@@ -1,6 +1,5 @@
#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
#include <CGAL/Polyhedron_3.h>
#include <CGAL/IO/Polyhedron_iostream.h>
#include <CGAL/Nef_polyhedron_3.h>
#include <CGAL/IO/Nef_polyhedron_iostream_3.h>
#include <iostream>
Expand Down
@@ -1,7 +1,6 @@
#include <CGAL/trace.h>
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Polyhedron_3.h>
#include <CGAL/IO/Polyhedron_iostream.h>
#include <CGAL/Surface_mesh_default_triangulation_3.h>
#include <CGAL/make_surface_mesh.h>
#include <CGAL/Implicit_surface_3.h>
Expand Down
@@ -1,6 +1,5 @@
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Polyhedron_3.h>
#include <CGAL/IO/Polyhedron_iostream.h>
#include <CGAL/poisson_surface_reconstruction.h>
#include <CGAL/IO/read_xyz_points.h>

Expand Down
@@ -1,8 +1,6 @@
#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Polyhedron_3.h>
#include <CGAL/boost/graph/properties_Polyhedron_3.h>
#include <CGAL/IO/Polyhedron_iostream.h>

#include <CGAL/Polygon_mesh_processing/fair.h>

Expand Down
Expand Up @@ -2,13 +2,11 @@
#include <CGAL/Exact_predicates_exact_constructions_kernel.h>

#include <CGAL/Polyhedron_3.h>
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/Surface_mesh.h>

#include <CGAL/Polygon_mesh_processing/orient_polygon_soup.h>
#include <CGAL/Polygon_mesh_processing/polygon_soup_to_polygon_mesh.h>

#include <CGAL/IO/Polyhedron_iostream.h>
#include <CGAL/algorithm.h>
#include <CGAL/Timer.h>

Expand Down
Expand Up @@ -2,8 +2,6 @@
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Side_of_triangle_mesh.h>
#include <CGAL/Polyhedron_3.h>
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/IO/Polyhedron_iostream.h>

#include "point_inside_helpers.h"

Expand Down
Expand Up @@ -4,11 +4,8 @@
#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
#ifdef USE_SURFACE_MESH
#include <CGAL/Surface_mesh.h>
#include <CGAL/boost/graph/graph_traits_Surface_mesh.h>
#else
#include <CGAL/Polyhedron_3.h>
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/IO/Polyhedron_iostream.h>
#endif
#include <CGAL/AABB_halfedge_graph_segment_primitive.h>

Expand Down
Expand Up @@ -2,8 +2,6 @@
#include <CGAL/Surface_mesh.h>
#include <CGAL/Polyhedron_3.h>
#include <CGAL/Linear_cell_complex_for_combinatorial_map.h>
#include <CGAL/boost/graph/graph_traits_Surface_mesh.h>
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/boost/graph/graph_traits_Linear_cell_complex_for_combinatorial_map.h>
#include <CGAL/Linear_cell_complex_for_bgl_combinatorial_map_helper.h>
#include <CGAL/iterator.h>
Expand Down
Expand Up @@ -7,7 +7,6 @@
#include <CGAL/Polygon_mesh_processing/corefinement.h>

#include <CGAL/Polyhedron_3.h>
#include <CGAL/IO/Polyhedron_iostream.h>

#include <iostream>
#include <vector>
Expand Down
Expand Up @@ -49,6 +49,7 @@ int main(int argc, char* argv[])
= PMP::sharp_edges_segmentation(mesh, 90, eif, pid,
PMP::parameters::first_index(1)
.vertex_incident_patches_map(vip));

CGAL_assertion(number_of_patches == 6);

PMP::detect_sharp_edges(mesh, 90, eif);
Expand Down Expand Up @@ -89,3 +90,4 @@ int main(int argc, char* argv[])
return 0;
}


@@ -1,5 +1,4 @@
#include <CGAL/Polyhedron_3.h>
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/Simple_cartesian.h>
#include <CGAL/Exact_predicates_exact_constructions_kernel.h>

Expand Down
@@ -1,8 +1,6 @@
#include <CGAL/Simple_cartesian.h>
#include <CGAL/Surface_mesh.h>
#include <CGAL/Polyhedron_3.h>
#include <CGAL/boost/graph/graph_traits_Surface_mesh.h>
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/Polygon_mesh_processing/repair.h>

#include <fstream>
Expand Down
@@ -1,8 +1,6 @@
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
#include <CGAL/Polyhedron_3.h>
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/IO/Polyhedron_iostream.h>
#include <CGAL/Surface_mesh.h>

#include <CGAL/Polygon_mesh_processing/stitch_borders.h>
Expand Down

0 comments on commit 9938100

Please sign in to comment.