songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6942 from sloriot/CGAL-header_clean_up 

Clean up in headers
This commit is contained in:
Laurent Rineau 2022-10-13 15:17:39 +02:00
parent e0b64dc1d7 e8c5de51b7
commit b232f4bcfd
34 changed files with 40 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Number_types/include/CGAL/Exact_rational.h
View File

@ -14,6 +14,9 @@
//
// Author(s) : Laurent Rineau
#ifndef CGAL_EXACT_RATIONAL_H
#define CGAL_EXACT_RATIONAL_H
#include <CGAL/Number_types/internal/Exact_type_selector.h>
namespace CGAL {
@ -44,3 +47,5 @@ typedef internal::Exact_field_selector<double>::Type Exact_rational;
#endif
} /* end namespace CGAL */
#endif // CGAL_EXACT_RATIONAL_H

5
Number_types/include/CGAL/Mpzf.h
View File

@ -10,12 +10,13 @@
//
// Author(s) : Marc Glisse
#ifndef CGAL_MPZF_H
#define CGAL_MPZF_H
#ifndef CGAL_NO_MPZF_DIVISION_OPERATOR
#define CGAL_MPZF_DIVISION_OPERATOR 1
#endif
#ifndef CGAL_MPZF_H
#define CGAL_MPZF_H
#include <cstdlib>
#include <algorithm>
#include <climits>

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/bbox.h
View File

@ -21,7 +21,7 @@
#include <boost/graph/graph_traits.hpp>
#include <CGAL/Named_function_parameters.h>
#include <CGAL/Polygon_mesh_processing/internal/named_params_helper.h>
#include <CGAL/boost/graph/named_params_helper.h>
namespace CGAL {

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/border.h
View File

@ -19,7 +19,7 @@
#include <CGAL/boost/graph/iterator.h>
#include <CGAL/boost/graph/helpers.h>
#include <CGAL/Named_function_parameters.h>
#include <CGAL/Polygon_mesh_processing/internal/named_params_helper.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <boost/graph/graph_traits.hpp>

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/compute_normal.h
View File

@ -17,7 +17,7 @@
#include <CGAL/license/Polygon_mesh_processing/Compute_normal.h>
#include <CGAL/Named_function_parameters.h>
#include <CGAL/Polygon_mesh_processing/internal/named_params_helper.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <CGAL/boost/graph/helpers.h>
#include <CGAL/boost/graph/properties.h>

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/connected_components.h
View File

@ -42,7 +42,7 @@
#include <CGAL/tuple.h>
#include <CGAL/Named_function_parameters.h>
#include <CGAL/Polygon_mesh_processing/internal/named_params_helper.h>
#include <CGAL/boost/graph/named_params_helper.h>
namespace CGAL {
namespace Polygon_mesh_processing{

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/detect_features.h
View File

@ -18,7 +18,7 @@
#include <CGAL/Kernel/global_functions_3.h>
#include <CGAL/Polygon_mesh_processing/compute_normal.h>
#include <CGAL/Polygon_mesh_processing/internal/named_params_helper.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <CGAL/boost/graph/properties.h>
#include <CGAL/Polygon_mesh_processing/connected_components.h>

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/distance.h
View File

@ -26,7 +26,7 @@
#include <CGAL/AABB_face_graph_triangle_primitive.h>
#include <CGAL/utility.h>
#include <CGAL/Named_function_parameters.h>
#include <CGAL/Polygon_mesh_processing/internal/named_params_helper.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <CGAL/point_generators_3.h>
#include <CGAL/Spatial_sort_traits_adapter_3.h>
#include <CGAL/spatial_sort.h>

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/fair.h
View File

@ -19,7 +19,7 @@
#include <CGAL/Polygon_mesh_processing/internal/fair_impl.h>
#include <CGAL/Named_function_parameters.h>
#include <CGAL/Polygon_mesh_processing/internal/named_params_helper.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <CGAL/Weights/cotangent_weights.h>
#if defined(CGAL_EIGEN3_ENABLED)

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Smoothing/curvature_flow_impl.h
View File

@ -18,7 +18,7 @@
#include <CGAL/Polygon_mesh_processing/measure.h>
#include <CGAL/Named_function_parameters.h>
#include <CGAL/Polygon_mesh_processing/internal/named_params_helper.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <CGAL/Weights/cotangent_weights.h>
#include <CGAL/Dynamic_property_map.h>
#include <CGAL/utility.h>

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Snapping/helper.h
View File

@ -18,7 +18,7 @@
#include <CGAL/boost/graph/iterator.h>
#include <CGAL/number_utils.h>
#include <CGAL/Named_function_parameters.h>
#include <CGAL/Polygon_mesh_processing/internal/named_params_helper.h>
#include <CGAL/boost/graph/named_params_helper.h>
namespace CGAL {
namespace Polygon_mesh_processing {

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Snapping/snap.h
View File

@ -26,7 +26,7 @@
#include <CGAL/Polygon_mesh_processing/internal/Snapping/snap_vertices.h>
#include <CGAL/Named_function_parameters.h>
#include <CGAL/Polygon_mesh_processing/internal/named_params_helper.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <CGAL/Polygon_mesh_processing/border.h>
#include <CGAL/Polygon_mesh_processing/compute_normal.h>

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Snapping/snap_vertices.h
View File

@ -23,7 +23,7 @@
#include <CGAL/Polygon_mesh_processing/internal/Snapping/helper.h>
#include <CGAL/Named_function_parameters.h>
#include <CGAL/Polygon_mesh_processing/internal/named_params_helper.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <CGAL/Polygon_mesh_processing/border.h>
#include <CGAL/assertions.h>

19
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/named_params_helper.h
View File

@ -1,19 +0,0 @@
// Copyright (c) 2015 GeometryFactory (France).
// All rights reserved.
//
// This file is part of CGAL (www.cgal.org).
//
// $URL$
// $Id$
// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-Commercial
//
// Author(s) : Jane Tournois
#ifndef CGAL_NAMED_PARAMETERS_HELPERS_H
#define CGAL_NAMED_PARAMETERS_HELPERS_H
#include <CGAL/license/Polygon_mesh_processing/core.h>
#include <CGAL/boost/graph/named_params_helper.h>
#endif //CGAL_NAMED_PARAMETERS_HELPERS_H

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/intersection.h
View File

@ -23,7 +23,7 @@
#include <CGAL/boost/iterator/counting_iterator.hpp>
#include <CGAL/box_intersection_d.h>
#include <CGAL/Polygon_mesh_processing/internal/Corefinement/intersection_impl.h>
#include <CGAL/Polygon_mesh_processing/internal/named_params_helper.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <CGAL/Polygon_mesh_processing/bbox.h>
#include <CGAL/Polygon_mesh_processing/connected_components.h>
#include <CGAL/Side_of_triangle_mesh.h>

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/locate.h
View File

@ -25,7 +25,7 @@
#include <CGAL/Kernel_traits.h>
#include <CGAL/Kernel/global_functions.h>
#include <CGAL/number_utils.h>
#include <CGAL/Polygon_mesh_processing/internal/named_params_helper.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <CGAL/Random.h>
#include <CGAL/use.h>

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/manifoldness.h
View File

@ -16,7 +16,7 @@
#include <CGAL/license/Polygon_mesh_processing/repair.h>
#include <CGAL/Named_function_parameters.h>
#include <CGAL/Polygon_mesh_processing/internal/named_params_helper.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <CGAL/algorithm.h>
#include <CGAL/assertions.h>

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/measure.h
View File

@ -22,7 +22,7 @@
#include <CGAL/boost/graph/helpers.h>
#include <CGAL/boost/graph/properties.h>
#include <CGAL/Named_function_parameters.h>
#include <CGAL/Polygon_mesh_processing/internal/named_params_helper.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <CGAL/Lazy.h> // needed for CGAL::exact(FT)/CGAL::exact(Lazy_exact_nt<T>)

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/merge_border_vertices.h
View File

@ -20,7 +20,7 @@
#include <CGAL/boost/graph/properties.h>
#include <CGAL/Polygon_mesh_processing/border.h>
#include <CGAL/Named_function_parameters.h>
#include <CGAL/Polygon_mesh_processing/internal/named_params_helper.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <CGAL/Polygon_mesh_processing/stitch_borders.h>
#include <algorithm>

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/orientation.h
View File

@ -22,7 +22,7 @@
#include <CGAL/Polygon_mesh_processing/stitch_borders.h>
#include <CGAL/Polygon_mesh_processing/compute_normal.h>
#include <CGAL/Named_function_parameters.h>
#include <CGAL/Polygon_mesh_processing/internal/named_params_helper.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <CGAL/Polygon_mesh_processing/self_intersections.h>
#include <CGAL/Side_of_triangle_mesh.h>
#include <CGAL/Projection_traits_xy_3.h>

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/random_perturbation.h
View File

@ -20,7 +20,7 @@
#include <CGAL/Polygon_mesh_processing/internal/Isotropic_remeshing/remesh_impl.h>
#include <CGAL/Named_function_parameters.h>
#include <CGAL/Polygon_mesh_processing/internal/named_params_helper.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <CGAL/AABB_tree.h>
#include <CGAL/AABB_traits.h>

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/refine.h
View File

@ -17,7 +17,7 @@
#include <CGAL/Named_function_parameters.h>
#include <CGAL/Polygon_mesh_processing/internal/named_params_helper.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <CGAL/Polygon_mesh_processing/internal/refine_impl.h>

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/remesh.h
View File

@ -20,7 +20,7 @@
#include <CGAL/Polygon_mesh_processing/internal/Isotropic_remeshing/remesh_impl.h>
#include <CGAL/Named_function_parameters.h>
#include <CGAL/Polygon_mesh_processing/internal/named_params_helper.h>
#include <CGAL/boost/graph/named_params_helper.h>
#ifdef CGAL_PMP_REMESHING_VERBOSE
#include <CGAL/Timer.h>

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair_polygon_soup.h
View File

@ -15,7 +15,7 @@
#include <CGAL/license/Polygon_mesh_processing/repair.h>
#include <CGAL/Named_function_parameters.h>
#include <CGAL/Polygon_mesh_processing/internal/named_params_helper.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <CGAL/Container_helper.h>
#include <CGAL/iterator.h>

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h
View File

@ -22,7 +22,7 @@
#include <CGAL/disable_warnings.h>
#include <CGAL/Named_function_parameters.h>
#include <CGAL/Polygon_mesh_processing/internal/named_params_helper.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <CGAL/algorithm.h>
#include <CGAL/Bbox_3.h>

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/shape_predicates.h
View File

@ -17,7 +17,7 @@
#include <CGAL/license/Polygon_mesh_processing/repair.h>
#include <CGAL/Named_function_parameters.h>
#include <CGAL/Polygon_mesh_processing/internal/named_params_helper.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <CGAL/array.h>
#include <CGAL/boost/graph/iterator.h>

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/stitch_borders.h
View File

@ -20,7 +20,7 @@
#include <CGAL/boost/graph/properties.h>
#include <CGAL/Named_function_parameters.h>
#include <CGAL/Polygon_mesh_processing/internal/named_params_helper.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <CGAL/Polygon_mesh_processing/border.h>
#include <CGAL/Polygon_mesh_processing/connected_components.h>
#include <CGAL/Polygon_mesh_processing/shape_predicates.h>

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/transform.h
View File

@ -14,7 +14,7 @@
#include <CGAL/license/Polygon_mesh_processing/core.h>
#include <CGAL/Named_function_parameters.h>
#include <CGAL/Polygon_mesh_processing/internal/named_params_helper.h>
#include <CGAL/boost/graph/named_params_helper.h>
namespace CGAL{
namespace Polygon_mesh_processing{

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangle.h
View File

@ -19,7 +19,7 @@
#include <boost/graph/graph_traits.hpp>
#include <CGAL/Named_function_parameters.h>
#include <CGAL/Polygon_mesh_processing/internal/named_params_helper.h>
#include <CGAL/boost/graph/named_params_helper.h>
namespace CGAL {

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h
View File

@ -32,7 +32,7 @@
#include <CGAL/Polygon_mesh_processing/triangulate_hole.h>
#include <CGAL/Polygon_mesh_processing/compute_normal.h>
#include <CGAL/Named_function_parameters.h>
#include <CGAL/Polygon_mesh_processing/internal/named_params_helper.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <boost/range/size.hpp>

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_hole.h
View File

@ -23,7 +23,7 @@
#include <CGAL/Polygon_mesh_processing/fair.h>
#include <CGAL/Named_function_parameters.h>
#include <CGAL/Polygon_mesh_processing/internal/named_params_helper.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <CGAL/boost/graph/helpers.h>

2
Polyhedron/demo/Polyhedron/Plugins/IO/VTK_io_plugin.cpp
View File

@ -68,7 +68,7 @@
#include <vtkXMLUnstructuredGridWriter.h>
#include <CGAL/Named_function_parameters.h>
#include <CGAL/Polygon_mesh_processing/internal/named_params_helper.h>
#include <CGAL/boost/graph/named_params_helper.h>
typedef Scene_surface_mesh_item Scene_facegraph_item;
typedef Scene_facegraph_item::Face_graph FaceGraph;
typedef boost::property_traits<boost::property_map<FaceGraph,

2
Polyhedron/demo/Polyhedron/include/CGAL/IO/read_surf_trianglemesh.h
View File

@ -9,7 +9,7 @@
#include <CGAL/Polygon_mesh_processing/repair.h>
#include <CGAL/Named_function_parameters.h>
#include <CGAL/Polygon_mesh_processing/internal/named_params_helper.h>
#include <CGAL/boost/graph/named_params_helper.h>
//a material is composed of an material Id and a material name.
typedef std::pair<int, std::string> material;

4
STL_Extension/include/CGAL/assertions_behaviour.h
View File

@ -14,11 +14,11 @@
//
// Author(s) : Geert-Jan Giezeman and Sven Schoenherr
#include <CGAL/config.h>
#ifndef CGAL_ASSERTIONS_BEHAVIOUR_H
#define CGAL_ASSERTIONS_BEHAVIOUR_H
#include <CGAL/config.h>
// workaround against the definition of EXIT in <opencv2/core/internal.hpp>
#ifdef EXIT
# undef EXIT