diff --git a/BGL/include/CGAL/boost/graph/METIS/partition_dual_graph.h b/BGL/include/CGAL/boost/graph/METIS/partition_dual_graph.h index 72be6347a71..53f8968f86f 100644 --- a/BGL/include/CGAL/boost/graph/METIS/partition_dual_graph.h +++ b/BGL/include/CGAL/boost/graph/METIS/partition_dual_graph.h @@ -33,6 +33,8 @@ namespace CGAL { namespace METIS { +#ifndef DOXYGEN_RUNNING + template void partition_dual_graph(const TriangleMesh& tm, int nparts, @@ -128,6 +130,8 @@ void partition_dual_graph(const TriangleMesh& tm, int nparts, return partition_dual_graph(tm, nparts, &options, np); } +#endif + /// \ingroup PkgBGLPartition /// /// computes a partition of the input triangular mesh into `nparts` parts, diff --git a/BGL/include/CGAL/boost/graph/METIS/partition_graph.h b/BGL/include/CGAL/boost/graph/METIS/partition_graph.h index e1054f84837..08926a64116 100644 --- a/BGL/include/CGAL/boost/graph/METIS/partition_graph.h +++ b/BGL/include/CGAL/boost/graph/METIS/partition_graph.h @@ -31,6 +31,8 @@ namespace CGAL { namespace METIS { +#ifndef DOXYGEN_RUNNING + struct Output_vertex_partition_ids { template @@ -68,6 +70,8 @@ struct Output_face_partition_ids } }; + + template void partition_graph(const TriangleMesh& tm, int nparts, @@ -161,6 +165,9 @@ void partition_graph(const TriangleMesh& tm, int nparts, return partition_graph(tm, nparts, &options, np); } +#endif + + /// \ingroup PkgBGLPartition /// /// computes a partition of the input triangular mesh into `nparts` parts, based on the diff --git a/BGL/include/CGAL/boost/graph/iterator.h b/BGL/include/CGAL/boost/graph/iterator.h index 54b54c08ecb..cef4a913cad 100644 --- a/BGL/include/CGAL/boost/graph/iterator.h +++ b/BGL/include/CGAL/boost/graph/iterator.h @@ -214,11 +214,6 @@ class Halfedge_around_source_iterator { #ifndef DOXYGEN_RUNNING - explicit operator bool() const - { - return (! (this->base() == nullptr)); - } - bool operator==( const Self& i) const { CGAL_assertion( anchor == anchor); return ( g == i.g) && ( pos == i.pos) && ( winding == i.winding); @@ -308,11 +303,6 @@ class Halfedge_around_target_iterator { #ifndef DOXYGEN_RUNNING - explicit operator bool() const - { - return (! (this->base() == nullptr)); - } - bool operator==( const Self& i) const { CGAL_assertion( anchor == anchor); return ( g == i.g) && ( pos == i.pos) && ( winding == i.winding); @@ -400,11 +390,6 @@ class Halfedge_around_face_iterator { pointer operator -> ( ) { return &pos; } const value_type* operator -> ( ) const { return &pos; } - explicit operator bool() const - { - return (! (this->base() == nullptr)); - } - bool operator==( const Self& i) const { CGAL_assertion( anchor == anchor); return ( g == i.g) && ( pos == i.pos) && ( winding == i.winding); diff --git a/Nef_3/examples/Nef_3/draw_nef_3.cpp b/Nef_3/examples/Nef_3/draw_nef_3.cpp index 0ccd07ba6f9..4037078a9a4 100644 --- a/Nef_3/examples/Nef_3/draw_nef_3.cpp +++ b/Nef_3/examples/Nef_3/draw_nef_3.cpp @@ -16,7 +16,7 @@ int main(int argc, char *argv[]) Polyhedron P1, P2; std::ifstream ifs1((argc > 1) ? argv[1] : CGAL::data_file_path("meshes/cross_quad.off")); ifs1 >> P1; - std::ifstream ifs2((argc > 1) ? argv[1] : CGAL::data_file_path("meshes/beam.off")); + std::ifstream ifs2((argc > 2) ? argv[2] : CGAL::data_file_path("meshes/beam.off")); ifs2 >> P2; // initialize nef from polyhedron diff --git a/Nef_3/include/CGAL/Nef_3/polygon_mesh_to_nef_3.h b/Nef_3/include/CGAL/Nef_3/polygon_mesh_to_nef_3.h index d222d741100..8dbae12430b 100644 --- a/Nef_3/include/CGAL/Nef_3/polygon_mesh_to_nef_3.h +++ b/Nef_3/include/CGAL/Nef_3/polygon_mesh_to_nef_3.h @@ -209,6 +209,7 @@ void polygon_mesh_to_nef_3(const PolygonMesh& P, SNC_structure& S, FaceIndexMap PolygonMesh, SNC_structure,HalfedgeIndexMap> index_adder(P,himap); for(vertex_descriptor pv : vertices(P) ) { + if (halfedge(pv, P) == boost::graph_traits::null_halfedge()) continue; // skip isolated vertices typename boost::property_traits::reference npv = get(pmap,pv); Vertex_handle nv = S.new_vertex(); diff --git a/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/Concepts/Periodic_2DelaunayTriangulationTraits_2.h b/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/Concepts/Periodic_2DelaunayTriangulationTraits_2.h index f9a8d6be4d9..7e16d0f3a2c 100644 --- a/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/Concepts/Periodic_2DelaunayTriangulationTraits_2.h +++ b/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/Concepts/Periodic_2DelaunayTriangulationTraits_2.h @@ -6,7 +6,7 @@ \cgalConcept The concept `Periodic_2DelaunayTriangulationTraits_2` is the first template parameter of the class -`Periodic_2_Delaunay_triangulation_2`. It refines the concepts +`CGAL::Periodic_2_Delaunay_triangulation_2`. It refines the concepts `Periodic_2TriangulationTraits_2` and `DelaunayTriangulationTraits_2`. It redefines the geometric objects, predicates and constructions to work with point-offset pairs. In most cases the offsets will be (0,0) and the @@ -125,4 +125,3 @@ class Periodic_2DelaunayTriangulationTraits_2 /// @} }; /* end Periodic_2DelaunayTriangulationTraits_2 */ - diff --git a/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/Concepts/Periodic_2TriangulationTraits_2.h b/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/Concepts/Periodic_2TriangulationTraits_2.h index 658d1a104da..55b9115ee30 100644 --- a/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/Concepts/Periodic_2TriangulationTraits_2.h +++ b/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/Concepts/Periodic_2TriangulationTraits_2.h @@ -6,7 +6,7 @@ \cgalConcept The concept `Periodic_2TriangulationTraits_2` is the first template parameter of the classes -`Periodic_2_triangulation_2`. This concept provides the types of +`CGAL::Periodic_2_triangulation_2`. This concept provides the types of the geometric primitives used in the triangulation and some function object types for the required predicates on those primitives. @@ -296,4 +296,3 @@ class Periodic_2TriangulationTraits_2 /// @} }; /* end Periodic_2TriangulationTraits_2 */ - diff --git a/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3RegularTriangulationTraits_3.h b/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3RegularTriangulationTraits_3.h index b190e091be4..79265e07187 100644 --- a/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3RegularTriangulationTraits_3.h +++ b/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3RegularTriangulationTraits_3.h @@ -20,7 +20,7 @@ functor the version without offsets. \cgalHasModelsEnd In addition to the requirements described for the traits class -RegularTriangulationTraits_3, the geometric traits class of a +`RegularTriangulationTraits_3`, the geometric traits class of a periodic regular triangulation must fulfill the following requirements. @@ -250,4 +250,3 @@ Construct_weighted_circumcenter_3 construct_weighted_circumcenter_3_object(); /// @} }; /* end Periodic_3RegularTriangulationTraits_3 */ - diff --git a/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3TriangulationTraits_3.h b/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3TriangulationTraits_3.h index b25e098a01c..4f806a44bd8 100644 --- a/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3TriangulationTraits_3.h +++ b/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/Concepts/Periodic_3TriangulationTraits_3.h @@ -4,7 +4,7 @@ \cgalConcept The concept `Periodic_3TriangulationTraits_3` is the first template parameter of the class -`Periodic_3_triangulation_3`. It refines the concept +`CGAL::Periodic_3_triangulation_3`. It refines the concept `TriangulationTraits_3` from the \cgal 3D Triangulations. It redefines the geometric objects, predicates and constructions to work with point-offset pairs. In most cases the offsets will be @@ -258,4 +258,3 @@ Construct_tetrahedron_3 construct_tetrahedron_3_object(); /// @} }; /* end Periodic_3TriangulationTraits_3 */ - diff --git a/Shape_detection/include/CGAL/Shape_detection/Efficient_RANSAC/Octree.h b/Shape_detection/include/CGAL/Shape_detection/Efficient_RANSAC/Octree.h index acb782b70a6..e965e9193bc 100644 --- a/Shape_detection/include/CGAL/Shape_detection/Efficient_RANSAC/Octree.h +++ b/Shape_detection/include/CGAL/Shape_detection/Efficient_RANSAC/Octree.h @@ -31,10 +31,6 @@ namespace CGAL { namespace Shape_detection { -// Forward declaration needed for automatic traits detection without -// including the deprecated header itself -template -struct Shape_detection_traits; namespace internal { @@ -43,9 +39,6 @@ struct Traits_base { typedef Traits type; }; template struct Traits_base > { typedef Gt type; }; -template -struct Traits_base > -{ typedef Gt type; }; template class RANSAC_octree { diff --git a/Triangulation_3/doc/Triangulation_3/Concepts/DelaunayTriangulationTraits_3.h b/Triangulation_3/doc/Triangulation_3/Concepts/DelaunayTriangulationTraits_3.h index 3a7514fab6a..064b89b4371 100644 --- a/Triangulation_3/doc/Triangulation_3/Concepts/DelaunayTriangulationTraits_3.h +++ b/Triangulation_3/doc/Triangulation_3/Concepts/DelaunayTriangulationTraits_3.h @@ -4,7 +4,7 @@ \cgalConcept The concept `DelaunayTriangulationTraits_3` is the first template parameter of the class -`Delaunay_triangulation_3`. It defines the geometric objects (points, +`CGAL::Delaunay_triangulation_3`. It defines the geometric objects (points, segments...) forming the triangulation together with a few geometric predicates and constructions on these objects. @@ -221,4 +221,3 @@ Construct_ray_3 construct_ray_3_object(); /// @} }; /* end DelaunayTriangulationTraits_3 */ - diff --git a/Triangulation_3/doc/Triangulation_3/Concepts/TriangulationTraits_3.h b/Triangulation_3/doc/Triangulation_3/Concepts/TriangulationTraits_3.h index 99f5fda1753..9bb4aa99b70 100644 --- a/Triangulation_3/doc/Triangulation_3/Concepts/TriangulationTraits_3.h +++ b/Triangulation_3/doc/Triangulation_3/Concepts/TriangulationTraits_3.h @@ -6,7 +6,7 @@ \cgalRefines{SpatialSortingTraits_3} The concept `TriangulationTraits_3` is the first template parameter of the class -`Triangulation_3`. It defines the geometric objects (points, segments, +`CGAL::Triangulation_3`. It defines the geometric objects (points, segments, triangles and tetrahedra) forming the triangulation together with a few geometric predicates and constructions on these objects: lexicographical comparison, orientation in case of coplanar points and orientation in space. @@ -188,4 +188,3 @@ Orientation_3 orientation_3_object(); /// @} }; /* end TriangulationTraits_3 */ -