diff --git a/AABB_tree/demo/AABB_tree/Scene.h b/AABB_tree/demo/AABB_tree/Scene.h index 2d96a28b283..648bbd81691 100644 --- a/AABB_tree/demo/AABB_tree/Scene.h +++ b/AABB_tree/demo/AABB_tree/Scene.h @@ -12,7 +12,6 @@ #include #include #include -#include #include #include diff --git a/AABB_tree/examples/AABB_tree/AABB_halfedge_graph_edge_example.cpp b/AABB_tree/examples/AABB_tree/AABB_halfedge_graph_edge_example.cpp index 85bbb47d46f..1f132b3d404 100644 --- a/AABB_tree/examples/AABB_tree/AABB_halfedge_graph_edge_example.cpp +++ b/AABB_tree/examples/AABB_tree/AABB_halfedge_graph_edge_example.cpp @@ -7,7 +7,6 @@ #include #include #include -#include #include #include #include diff --git a/AABB_tree/examples/AABB_tree/AABB_polyhedron_edge_example.cpp b/AABB_tree/examples/AABB_tree/AABB_polyhedron_edge_example.cpp index 31f4473529b..24669c85970 100644 --- a/AABB_tree/examples/AABB_tree/AABB_polyhedron_edge_example.cpp +++ b/AABB_tree/examples/AABB_tree/AABB_polyhedron_edge_example.cpp @@ -8,7 +8,6 @@ #include #include #include -#include typedef CGAL::Simple_cartesian K; typedef K::FT FT; diff --git a/AABB_tree/test/AABB_tree/aabb_any_all_benchmark.cpp b/AABB_tree/test/AABB_tree/aabb_any_all_benchmark.cpp index e74c435f519..3d70216d0c5 100644 --- a/AABB_tree/test/AABB_tree/aabb_any_all_benchmark.cpp +++ b/AABB_tree/test/AABB_tree/aabb_any_all_benchmark.cpp @@ -19,7 +19,6 @@ #include #include #include -#include #include #include diff --git a/BGL/examples/BGL_polyhedron_3/distance.cpp b/BGL/examples/BGL_polyhedron_3/distance.cpp index b1f9649cc58..bd789517360 100644 --- a/BGL/examples/BGL_polyhedron_3/distance.cpp +++ b/BGL/examples/BGL_polyhedron_3/distance.cpp @@ -3,7 +3,6 @@ #include #include #include -#include #include diff --git a/BGL/examples/BGL_polyhedron_3/kruskal.cpp b/BGL/examples/BGL_polyhedron_3/kruskal.cpp index 3648ef99410..f06179f34b2 100644 --- a/BGL/examples/BGL_polyhedron_3/kruskal.cpp +++ b/BGL/examples/BGL_polyhedron_3/kruskal.cpp @@ -2,7 +2,6 @@ #include #include #include -#include #include #include diff --git a/BGL/examples/BGL_polyhedron_3/kruskal_with_stored_id.cpp b/BGL/examples/BGL_polyhedron_3/kruskal_with_stored_id.cpp index 5cdb456f1bc..85207e466ca 100644 --- a/BGL/examples/BGL_polyhedron_3/kruskal_with_stored_id.cpp +++ b/BGL/examples/BGL_polyhedron_3/kruskal_with_stored_id.cpp @@ -3,7 +3,6 @@ #include #include #include -#include #include #include diff --git a/BGL/examples/BGL_polyhedron_3/normals.cpp b/BGL/examples/BGL_polyhedron_3/normals.cpp index a5e569e5412..0f97f386ab3 100644 --- a/BGL/examples/BGL_polyhedron_3/normals.cpp +++ b/BGL/examples/BGL_polyhedron_3/normals.cpp @@ -13,8 +13,6 @@ #include // Graph traits adaptors -#include -#include #include typedef CGAL::Cartesian Kernel; diff --git a/BGL/examples/BGL_polyhedron_3/range.cpp b/BGL/examples/BGL_polyhedron_3/range.cpp index a2214786b2a..7be745c7ef3 100644 --- a/BGL/examples/BGL_polyhedron_3/range.cpp +++ b/BGL/examples/BGL_polyhedron_3/range.cpp @@ -3,7 +3,6 @@ #include #include #include -#include #include diff --git a/BGL/include/CGAL/boost/graph/graph_traits_Polyhedron_3.h b/BGL/include/CGAL/boost/graph/graph_traits_Polyhedron_3.h index d8da8fc77bc..428785e6b44 100644 --- a/BGL/include/CGAL/boost/graph/graph_traits_Polyhedron_3.h +++ b/BGL/include/CGAL/boost/graph/graph_traits_Polyhedron_3.h @@ -501,4 +501,6 @@ namespace boost { #undef CGAL_HDS_PARAM_ +#include + #endif // CGAL_BOOST_GRAPH_GRAPH_TRAITS_POLYHEDRON_3_H diff --git a/BGL/test/BGL/graph_concept_Polyhedron_3.cpp b/BGL/test/BGL/graph_concept_Polyhedron_3.cpp index 6a641370524..2eef3e8c5cc 100644 --- a/BGL/test/BGL/graph_concept_Polyhedron_3.cpp +++ b/BGL/test/BGL/graph_concept_Polyhedron_3.cpp @@ -22,8 +22,6 @@ #include #include #include -#include - typedef CGAL::Simple_cartesian Kernel; typedef CGAL::Polyhedron_3 Polyhedron; diff --git a/BGL/test/BGL/test_Prefix.h b/BGL/test/BGL/test_Prefix.h index ace26148b86..9e775ab9e89 100644 --- a/BGL/test/BGL/test_Prefix.h +++ b/BGL/test/BGL/test_Prefix.h @@ -14,7 +14,6 @@ #include #include -#include #ifdef CGAL_USE_SURFACE_MESH #include diff --git a/BGL/test/BGL/test_circulator.cpp b/BGL/test/BGL/test_circulator.cpp index 65c8589f66e..1614444c984 100644 --- a/BGL/test/BGL/test_circulator.cpp +++ b/BGL/test/BGL/test_circulator.cpp @@ -2,7 +2,6 @@ #include #include #include -#include #include #include diff --git a/Polyhedron/include/CGAL/Polyhedron_3_property_map.h b/Polyhedron/include/CGAL/Polyhedron_3_property_map.h deleted file mode 100644 index 39553d8b71d..00000000000 --- a/Polyhedron/include/CGAL/Polyhedron_3_property_map.h +++ /dev/null @@ -1,199 +0,0 @@ -// Copyright (c) 2012 GeometryFactory (France). -// All rights reserved. -// -// This file is part of CGAL (www.cgal.org). -// You can redistribute it and/or modify it under the terms of the GNU -// General Public License as published by the Free Software Foundation, -// either version 3 of the License, or (at your option) any later version. -// -// Licensees holding a valid commercial license may use this file in -// accordance with the commercial license agreement provided with the software. -// -// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -// -// $URL$ -// $Id$ -// -// -// Author(s) : Sebastien Loriot -// - -#ifndef CGAL_POLYHEDRON_SIMPLEX_PROPERTY_MAP_H -#define CGAL_POLYHEDRON_SIMPLEX_PROPERTY_MAP_H - -#include -#include -#include -#include -#include -#include - -namespace CGAL{ - -//property map -template -struct Triangle_from_face_descriptor_property_map{ - typename boost::remove_const::type* m_graph; - VertexPointPMap m_vppm; - - Triangle_from_face_descriptor_property_map() : m_graph(NULL) - {} - - Triangle_from_face_descriptor_property_map(FaceGraph* g) - : m_graph( const_cast::type*>(g) ), - m_vppm( get(vertex_point, *m_graph) ) - {} - - Triangle_from_face_descriptor_property_map(FaceGraph* g, - VertexPointPMap vppm ) - : m_graph(const_cast::type*>(g)), - m_vppm(vppm) - {} - - typedef typename boost::property_traits< VertexPointPMap >::value_type Point_3; - typedef typename Kernel_traits::Kernel::Triangle_3 Triangle_3; - - //classical typedefs - typedef typename boost::graph_traits::face_descriptor key_type; - typedef Triangle_3 value_type; - typedef value_type reference; - typedef boost::readable_property_map_tag category; - - //get function for property map - inline friend - Triangle_3 - get(const Triangle_from_face_descriptor_property_map& pmap, - typename Triangle_from_face_descriptor_property_map::key_type f) - { - typedef typename boost::property_traits< VertexPointPMap >::value_type Point_3; - typedef typename Kernel_traits::Kernel::Triangle_3 Triangle_3; - typename boost::remove_const::type & g = *(pmap.m_graph); - - CGAL_precondition(halfedge(f,g) == next(next(next(halfedge(f,g),g),g),g)); - const Point_3& a = get(pmap.m_vppm, target(halfedge(f,g),g)); - const Point_3& b = get(pmap.m_vppm, target(next(halfedge(f,g),g),g)); - const Point_3& c = get(pmap.m_vppm,target(next(next(halfedge(f,g),g),g),g)); - - return Triangle_3(a,b,c); - } -}; - - -template < class HalfedgeGraph, - class VertexPointPMap > -struct Segment_from_edge_descriptor_property_map{ - - Segment_from_edge_descriptor_property_map() - {} - -Segment_from_edge_descriptor_property_map(HalfedgeGraph* g) - : m_graph( const_cast::type*>(g) ), - m_vppm( get(vertex_point, *m_graph) ) - {} - - Segment_from_edge_descriptor_property_map(HalfedgeGraph* g, - VertexPointPMap vppm ) - : m_graph( const_cast::type*>(g) ), - m_vppm(vppm) - {} - - //classical typedefs - typedef typename boost::property_traits< VertexPointPMap >::value_type Point; - typedef typename boost::graph_traits::edge_descriptor key_type; - typedef typename Kernel_traits::Kernel::Segment_3 value_type; - typedef value_type reference; - typedef boost::readable_property_map_tag category; - //data - typename boost::remove_const::type* m_graph; - VertexPointPMap m_vppm; - - //get function for property map - inline friend - value_type - get(Segment_from_edge_descriptor_property_map pmap, - key_type h) - { - typedef typename boost::property_traits< VertexPointPMap >::value_type Point; - typedef typename Kernel_traits::Kernel::Segment_3 Segment_3; - - return Segment_3(get(pmap.m_vppm, source(h, *pmap.m_graph) ), - get(pmap.m_vppm, target(h, *pmap.m_graph) ) ); - } -}; - -//property map to access a point from a facet handle -template -struct One_point_from_face_descriptor_property_map{ - - One_point_from_face_descriptor_property_map(FaceGraph* g = NULL) - : m_graph( const_cast::type*>(g) ) - {} - - One_point_from_face_descriptor_property_map(FaceGraph* g, VertexPointPMap vppm ) - : m_graph( const_cast::type*>(g) ), - m_vppm(vppm) - {} - - typename boost::remove_const::type* m_graph; - VertexPointPMap m_vppm; - - //classical typedefs - typedef typename boost::graph_traits::face_descriptor key_type; - typedef typename boost::property_traits< VertexPointPMap >::value_type value_type; - typedef typename boost::property_traits< VertexPointPMap >::reference reference; - typedef boost::lvalue_property_map_tag category; - - //get function for property map - inline friend - reference - get(const One_point_from_face_descriptor_property_map& m, - key_type f) - { - return get(m.m_vppm, target(halfedge(f, *m.m_graph), *m.m_graph)); - } -}; - -//property map to access a point from an edge -template < class HalfedgeGraph, - class VertexPointPMap > -struct Source_point_from_edge_descriptor{ - Source_point_from_edge_descriptor( - HalfedgeGraph* g = NULL ) : - m_graph( const_cast::type*>(g) ), - m_vppm( get(vertex_point, *m_graph) ) - {} - - Source_point_from_edge_descriptor( - HalfedgeGraph* g, - VertexPointPMap vppm ) : - m_graph( const_cast::type*>(g) ), - m_vppm(vppm) - {} - - //classical typedefs - typedef typename boost::property_traits< VertexPointPMap >::value_type value_type; - typedef typename boost::property_traits< VertexPointPMap >::reference reference; - typedef typename boost::graph_traits::edge_descriptor key_type; - typedef boost::readable_property_map_tag category; - //data - typename boost::remove_const::type* m_graph; - VertexPointPMap m_vppm; - - //get function for property map - inline friend - reference - get(Source_point_from_edge_descriptor pmap, - key_type h) - { - return get(vertex_point, - *pmap.m_graph, - source(h, *pmap.m_graph) ); - } -}; - -} //namespace CGAL - -#endif //CGAL_POLYHEDRON_SIMPLEX_PROPERTY_MAP_H diff --git a/Surface_mesh_simplification/examples/Surface_mesh_simplification/edge_collapse_constrain_sharp_edges.cpp b/Surface_mesh_simplification/examples/Surface_mesh_simplification/edge_collapse_constrain_sharp_edges.cpp index 16af0fd0585..d60957975aa 100644 --- a/Surface_mesh_simplification/examples/Surface_mesh_simplification/edge_collapse_constrain_sharp_edges.cpp +++ b/Surface_mesh_simplification/examples/Surface_mesh_simplification/edge_collapse_constrain_sharp_edges.cpp @@ -5,7 +5,6 @@ #include #include #include -#include #include #include diff --git a/Surface_mesh_simplification/examples/Surface_mesh_simplification/edge_collapse_constrained_border_polyhedron.cpp b/Surface_mesh_simplification/examples/Surface_mesh_simplification/edge_collapse_constrained_border_polyhedron.cpp index e098319345f..71342351e84 100644 --- a/Surface_mesh_simplification/examples/Surface_mesh_simplification/edge_collapse_constrained_border_polyhedron.cpp +++ b/Surface_mesh_simplification/examples/Surface_mesh_simplification/edge_collapse_constrained_border_polyhedron.cpp @@ -6,7 +6,6 @@ #include #include #include -#include // Simplification function #include diff --git a/Surface_mesh_simplification/examples/Surface_mesh_simplification/edge_collapse_enriched_polyhedron.cpp b/Surface_mesh_simplification/examples/Surface_mesh_simplification/edge_collapse_enriched_polyhedron.cpp index 8e3a7aebbf0..754e3d6732b 100644 --- a/Surface_mesh_simplification/examples/Surface_mesh_simplification/edge_collapse_enriched_polyhedron.cpp +++ b/Surface_mesh_simplification/examples/Surface_mesh_simplification/edge_collapse_enriched_polyhedron.cpp @@ -6,7 +6,6 @@ #include #include -#include // Simplification function #include diff --git a/Surface_mesh_simplification/examples/Surface_mesh_simplification/edge_collapse_polyhedron.cpp b/Surface_mesh_simplification/examples/Surface_mesh_simplification/edge_collapse_polyhedron.cpp index 0d19c1ed655..60b275ec8c2 100644 --- a/Surface_mesh_simplification/examples/Surface_mesh_simplification/edge_collapse_polyhedron.cpp +++ b/Surface_mesh_simplification/examples/Surface_mesh_simplification/edge_collapse_polyhedron.cpp @@ -5,7 +5,6 @@ #include #include #include -#include // Simplification function #include diff --git a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/HalfedgeGraph_Polyhedron_3.h b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/HalfedgeGraph_Polyhedron_3.h index b7a454c4775..c677f30a954 100644 --- a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/HalfedgeGraph_Polyhedron_3.h +++ b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/HalfedgeGraph_Polyhedron_3.h @@ -21,7 +21,6 @@ #include #include -#include #endif // CGAL_SURFACE_MESH_SIMPLIFICATION_HALFEDGEGRAPH_POLYHEDRON_3_H // EOF // diff --git a/Surface_mesh_simplification/test/Surface_mesh_simplification/basics.h b/Surface_mesh_simplification/test/Surface_mesh_simplification/basics.h index 79a9d5ef5a4..6f3b1ae089d 100644 --- a/Surface_mesh_simplification/test/Surface_mesh_simplification/basics.h +++ b/Surface_mesh_simplification/test/Surface_mesh_simplification/basics.h @@ -28,7 +28,6 @@ void Surface_simplification_external_trace( std::string s ) #include #include -#include #include #include diff --git a/Surface_mesh_simplification/test/Surface_mesh_simplification/edge_collapse_topology.cpp b/Surface_mesh_simplification/test/Surface_mesh_simplification/edge_collapse_topology.cpp index df6de357de9..017b1bd86e8 100644 --- a/Surface_mesh_simplification/test/Surface_mesh_simplification/edge_collapse_topology.cpp +++ b/Surface_mesh_simplification/test/Surface_mesh_simplification/edge_collapse_topology.cpp @@ -6,7 +6,6 @@ #include #include -#include // Simplification function #include