diff --git a/AABB_tree/doc/AABB_tree/Concepts/AABBPrimitive.h b/AABB_tree/doc/AABB_tree/Concepts/AABBPrimitive.h index 43ae5fd38b7..05ddf7a58cb 100644 --- a/AABB_tree/doc/AABB_tree/Concepts/AABBPrimitive.h +++ b/AABB_tree/doc/AABB_tree/Concepts/AABBPrimitive.h @@ -12,11 +12,11 @@ The concept `AABBPrimitive` describes the requirements for the primitives stored The `Primitive` type can be, e.g., a wrapper around a `Handle`. Assume for instance that the input objects are the triangle faces of a mesh stored as a `CGAL::Polyhedron_3`. The `Datum` would be a `Triangle_3` and the `Id` would be a polyhedron `Face_handle`. Method `datum()` can return either a `Triangle_3` constructed on the fly from the face handle or a `Triangle_3` stored internally. This provides a way for the user to trade memory for efficiency. -\cgalHasModel `CGAL::AABB_primitive` -\cgalHasModel `CGAL::AABB_segment_primitive` -\cgalHasModel `CGAL::AABB_triangle_primitive` -\cgalHasModel `CGAL::AABB_HalfedgeGraph_segment_primitive` -\cgalHasModel `CGAL::AABB_FaceGraph_triangle_primitive` +\cgalHasModel `CGAL::AABB_primitive` +\cgalHasModel `CGAL::AABB_segment_primitive` +\cgalHasModel `CGAL::AABB_triangle_primitive` +\cgalHasModel `CGAL::AABB_HalfedgeGraph_segment_primitive` +\cgalHasModel `CGAL::AABB_FaceGraph_triangle_primitive` */ class AABBPrimitive { diff --git a/AABB_tree/doc/AABB_tree/Concepts/AABBPrimitiveWithSharedData.h b/AABB_tree/doc/AABB_tree/Concepts/AABBPrimitiveWithSharedData.h index ad0ff9772db..ed89a1a3409 100644 --- a/AABB_tree/doc/AABB_tree/Concepts/AABBPrimitiveWithSharedData.h +++ b/AABB_tree/doc/AABB_tree/Concepts/AABBPrimitiveWithSharedData.h @@ -21,9 +21,9 @@ The `Datum` would be a `Triangle_3` and the `Id` a `std::size_t`. The shared dat `std::vector`. The method `datum(const Shared_data&)` then returns a triangle from the vector. -\cgalHasModel `CGAL::AABB_primitive` -\cgalHasModel `CGAL::AABB_HalfedgeGraph_segment_primitive` -\cgalHasModel `CGAL::AABB_FaceGraph_triangle_primitive` +\cgalHasModel `CGAL::AABB_primitive` +\cgalHasModel `CGAL::AABB_HalfedgeGraph_segment_primitive` +\cgalHasModel `CGAL::AABB_FaceGraph_triangle_primitive` */ class AABBPrimitiveWithSharedData { diff --git a/AABB_tree/doc/AABB_tree/PackageDescription.txt b/AABB_tree/doc/AABB_tree/PackageDescription.txt index 1a6ed47fa15..ad6a04b5b1b 100644 --- a/AABB_tree/doc/AABB_tree/PackageDescription.txt +++ b/AABB_tree/doc/AABB_tree/PackageDescription.txt @@ -33,9 +33,9 @@ - `CGAL::AABB_tree` ## Primitives ## -- `CGAL::AABB_triangle_primitive` -- `CGAL::AABB_segment_primitive` -- `CGAL::AABB_primitive` -- `CGAL::AABB_HalfedgeGraph_segment_primitive` -- `CGAL::AABB_FaceGraph_triangle_primitive` +- `CGAL::AABB_triangle_primitive` +- `CGAL::AABB_segment_primitive` +- `CGAL::AABB_primitive` +- `CGAL::AABB_HalfedgeGraph_segment_primitive` +- `CGAL::AABB_FaceGraph_triangle_primitive` */ diff --git a/AABB_tree/doc_tex/AABB_tree_ref/AABBPrimitive.tex b/AABB_tree/doc_tex/AABB_tree_ref/AABBPrimitive.tex index 8eaba02f83d..ecea7797593 100644 --- a/AABB_tree/doc_tex/AABB_tree_ref/AABBPrimitive.tex +++ b/AABB_tree/doc_tex/AABB_tree_ref/AABBPrimitive.tex @@ -57,11 +57,11 @@ The concept \ccRefName\ describes the requirements for the primitives stored in The \ccc{Primitive} type can be, e.g., a wrapper around a \ccc{Handle}. Assume for instance that the input objects are the triangle faces of a mesh stored as a \ccc{CGAL::Polyhedron}. The \ccc{Datum} would be a \ccc{Triangle_3} and the \ccc{Id} would be a polyhedron \ccc{Face_handle}. Method \ccc{datum()} can return either a \ccc{Triangle_3} constructed on the fly from the face handle or a \ccc{Triangle_3} stored internally. This provides a way for the user to trade memory for efficiency. \ccHasModels -\ccc{AABB_primitive},\\ -\ccc{AABB_segment_primitive},\\ -\ccc{AABB_triangle_primitive},\\ -\ccc{AABB_HalfedgeGraph_segment_primitive},\\ -\ccc{AABB_FaceGraph_triangle_primitive}.\\ +\ccc{AABB_primitive},\\ +\ccc{AABB_segment_primitive},\\ +\ccc{AABB_triangle_primitive},\\ +\ccc{AABB_HalfedgeGraph_segment_primitive},\\ +\ccc{AABB_FaceGraph_triangle_primitive}.\\ \end{ccRefConcept} diff --git a/AABB_tree/doc_tex/AABB_tree_ref/AABBPrimitiveWithSharedData.tex b/AABB_tree/doc_tex/AABB_tree_ref/AABBPrimitiveWithSharedData.tex index 2a7d1e9a2b5..c35248e8025 100644 --- a/AABB_tree/doc_tex/AABB_tree_ref/AABBPrimitiveWithSharedData.tex +++ b/AABB_tree/doc_tex/AABB_tree_ref/AABBPrimitiveWithSharedData.tex @@ -46,9 +46,9 @@ The concept is similar to \ccc{AABBPrimitive} except that some data stored outsi The \ccc{Primitive} type can be, e.g., a wrapper around a \ccc{Handle}. Assume for instance that the input objects are the triangle faces of a mesh stored as a \ccc{CGAL::Polyhedron}. The \ccc{Datum} would be a \ccc{Triangle_3} and the \ccc{Id} would be a polyhedron \ccc{Face_handle}. Method \ccc{datum()} can return either a \ccc{Triangle_3} constructed on the fly from the face handle or a \ccc{Triangle_3} stored internally. This provides a way for the user to trade memory for efficiency. \ccHasModels -\ccc{AABB_primitive},\\ -\ccc{AABB_HalfedgeGraph_segment_primitive},\\ -\ccc{AABB_FaceGraph_triangle_primitive}.\\ +\ccc{AABB_primitive},\\ +\ccc{AABB_HalfedgeGraph_segment_primitive},\\ +\ccc{AABB_FaceGraph_triangle_primitive}.\\ \end{ccRefConcept} diff --git a/AABB_tree/doc_tex/AABB_tree_ref/AABB_FaceGraph_triangle_primitive.tex b/AABB_tree/doc_tex/AABB_tree_ref/AABB_FaceGraph_triangle_primitive.tex index 3c6c9d09e02..9c9dedbb7f6 100644 --- a/AABB_tree/doc_tex/AABB_tree_ref/AABB_FaceGraph_triangle_primitive.tex +++ b/AABB_tree/doc_tex/AABB_tree_ref/AABB_FaceGraph_triangle_primitive.tex @@ -1,6 +1,6 @@ \ccRefPageBegin -\begin{ccRefClass}{AABB_FaceGraph_triangle_primitive} +\begin{ccRefClass}{AABB_FaceGraph_triangle_primitive} \ccDefinition @@ -16,7 +16,7 @@ while the AABB tree holding the primitive is in use. \ccc{FaceGraph} is a model of the face graph concept.\\ \ccc{OneFaceGraphPerTree} is either \ccc{CGAL::Tag_true} or \ccc{CGAL::Tag_false}. In the former case, we guarantee that all the primitives will be from a common \ccc{FaceGraph} and some data will be factorized so that the size of the primitive is reduced. In the latter case, the primitives can be from different graphs and extra storage is required in the primitives. The default is \ccc{CGAL::Tag_true}.\\ -\ccc{cache_datum} is either \ccc{CGAL::Tag_true} or \ccc{CGAL::Tag_false}. In the former case, the datum is stored in the primitive, while in the latter it is constructed on the fly to reduce +\ccc{CacheDatum} is either \ccc{CGAL::Tag_true} or \ccc{CGAL::Tag_false}. In the former case, the datum is stored in the primitive, while in the latter it is constructed on the fly to reduce the memory footprint. The default is \ccc{CGAL::Tag_false} (datum is not stored).\\ \ccInclude{CGAL/AABB_FaceGraph_triangle_primitive.h} @@ -40,8 +40,8 @@ AABB_FaceGraph_triangle_primitive(Iterator it,const FaceGraph& graph)} \ccSeeAlso \ccc{AABBPrimitive},\\ -\ccc{AABB_primitive},\\ -\ccc{AABB_HalfedgeGraph_segment_primitive}.\\ +\ccc{AABB_primitive},\\ +\ccc{AABB_HalfedgeGraph_segment_primitive}.\\ \end{ccRefClass} diff --git a/AABB_tree/doc_tex/AABB_tree_ref/AABB_HalfedgeGraph_segment_primitive.tex b/AABB_tree/doc_tex/AABB_tree_ref/AABB_HalfedgeGraph_segment_primitive.tex index afe05c84c29..2b277f95414 100644 --- a/AABB_tree/doc_tex/AABB_tree_ref/AABB_HalfedgeGraph_segment_primitive.tex +++ b/AABB_tree/doc_tex/AABB_tree_ref/AABB_HalfedgeGraph_segment_primitive.tex @@ -1,6 +1,6 @@ \ccRefPageBegin -\begin{ccRefClass}{AABB_HalfedgeGraph_segment_primitive} +\begin{ccRefClass}{AABB_HalfedgeGraph_segment_primitive} \ccDefinition @@ -16,7 +16,7 @@ while the AABB tree holding the primitive is in use. \ccc{HalfedgeGraph} is a model of the halfedge graph concept.\\ \ccc{OneHalfedgeGraphPerTree} is either \ccc{CGAL::Tag_true} or \ccc{CGAL::Tag_false}. In the former case, we guarantee that all the primitives will be from a common \ccc{HalfedgeGraph} and some data will be factorized so that the size of the primitive is reduced. In the latter case, the primitives can be from different graphs and extra storage is required in the primitives. The default is \ccc{CGAL::Tag_true}.\\ -\ccc{cache_datum} is either \ccc{CGAL::Tag_true} or \ccc{CGAL::Tag_false}. In the former case, the datum is stored in the primitive, while in the latter it is constructed on the fly to reduce +\ccc{CacheDatum} is either \ccc{CGAL::Tag_true} or \ccc{CGAL::Tag_false}. In the former case, the datum is stored in the primitive, while in the latter it is constructed on the fly to reduce the memory footprint. The default is \ccc{CGAL::Tag_false} (datum is not stored). \ccInclude{CGAL/AABB_HalfedgeGraph_segment_primitive.h} @@ -41,8 +41,8 @@ The example below gives a way to call this constructor the insert-by-range metho \ccSeeAlso \ccc{AABBPrimitive},\\ -\ccc{AABB_primitive},\\ -\ccc{AABB_FaceGraph_triangle_primitive}.\\ +\ccc{AABB_primitive},\\ +\ccc{AABB_FaceGraph_triangle_primitive}.\\ \ccIncludeExampleCode{AABB_tree/AABB_HalfedgeGraph_edge_example.cpp} diff --git a/AABB_tree/doc_tex/AABB_tree_ref/AABB_polyhedron_segment_primitive.tex b/AABB_tree/doc_tex/AABB_tree_ref/AABB_polyhedron_segment_primitive.tex index 5746a4e090f..852eabca8fd 100644 --- a/AABB_tree/doc_tex/AABB_tree_ref/AABB_polyhedron_segment_primitive.tex +++ b/AABB_tree/doc_tex/AABB_tree_ref/AABB_polyhedron_segment_primitive.tex @@ -17,7 +17,7 @@ %% \ccHtmlCrossLink{} %% add further rules for cross referencing links %% \ccHtmlIndexC[class]{} %% add further index entries -This class is deprecated since \cgal\ 4.3, the class \ccc{CGAL::AABB_HalfedgeGraph_segment_primitive} should be used instead. +This class is deprecated since \cgal\ 4.3, the class \ccc{CGAL::AABB_HalfedgeGraph_segment_primitive} should be used instead. \begin{ccDeprecated} diff --git a/AABB_tree/doc_tex/AABB_tree_ref/AABB_polyhedron_triangle_primitive.tex b/AABB_tree/doc_tex/AABB_tree_ref/AABB_polyhedron_triangle_primitive.tex index a2a7314420e..66090d6020c 100644 --- a/AABB_tree/doc_tex/AABB_tree_ref/AABB_polyhedron_triangle_primitive.tex +++ b/AABB_tree/doc_tex/AABB_tree_ref/AABB_polyhedron_triangle_primitive.tex @@ -18,7 +18,7 @@ %% \ccHtmlCrossLink{} %% add further rules for cross referencing links %% \ccHtmlIndexC[class]{} %% add further index entries -This class is deprecated since \cgal\ 4.3, the class \ccc{CGAL::AABB_FaceGraph_triangle_primitive} should be used instead. +This class is deprecated since \cgal\ 4.3, the class \ccc{CGAL::AABB_FaceGraph_triangle_primitive} should be used instead. \begin{ccDeprecated} \ccDefinition diff --git a/AABB_tree/doc_tex/AABB_tree_ref/AABB_primitive.tex b/AABB_tree/doc_tex/AABB_tree_ref/AABB_primitive.tex index 1234808f497..3bf446a64e5 100644 --- a/AABB_tree/doc_tex/AABB_tree_ref/AABB_primitive.tex +++ b/AABB_tree/doc_tex/AABB_tree_ref/AABB_primitive.tex @@ -1,5 +1,5 @@ -\begin{ccRefClass}{AABB_primitive} +\begin{ccRefClass}{AABB_primitive} \ccDefinition @@ -16,7 +16,7 @@ with \ccc{Id} as \ccc{key_type}. It must be default constructible.\\ \ccc{PointPropertyMap} is a model of \ccAnchor{http://www.boost.org/doc/libs/release/libs/property_map/doc/ReadablePropertyMap.html}{boost::ReadablePropertyMap} with \ccc{Id} as \ccc{key_type}. It must be default constructible.\\ \ccc{ExternalPropertyMaps}: either \ccc{CGAL::Tag_true} or \ccc{CGAL::Tag_false}. In the former case, the property maps will be stored in the traits class, while in the latter they will be stored in the primitive (which increases the size of each primitive).\\ -\ccc{cache_datum}: either \ccc{CGAL::Tag_true} or \ccc{CGAL::Tag_false}. In the former case, the datum is stored in the primitive, while in the latter it is constructed on the fly to reduce +\ccc{CacheDatum}: either \ccc{CGAL::Tag_true} or \ccc{CGAL::Tag_false}. In the former case, the datum is stored in the primitive, while in the latter it is constructed on the fly to reduce the memory footprint. The default is \ccc{CGAL::Tag_false} (datum is not stored). \ccInclude{CGAL/AABB_primitive.h} @@ -38,10 +38,10 @@ the memory footprint. The default is \ccc{CGAL::Tag_false} (datum is not stored) \ccSeeAlso \ccc{AABBPrimitive},\\ -\ccc{AABB_segment_primitive},\\ -\ccc{AABB_triangle_primitive},\\ -\ccc{AABB_HalfedgeGraph_segment_primitive},\\ -\ccc{AABB_FaceGraph_triangle_primitive}. +\ccc{AABB_segment_primitive},\\ +\ccc{AABB_triangle_primitive},\\ +\ccc{AABB_HalfedgeGraph_segment_primitive},\\ +\ccc{AABB_FaceGraph_triangle_primitive}. \end{ccRefClass} diff --git a/AABB_tree/doc_tex/AABB_tree_ref/AABB_segment_primitive.tex b/AABB_tree/doc_tex/AABB_tree_ref/AABB_segment_primitive.tex index 3e8bee3c116..c18833f94ed 100644 --- a/AABB_tree/doc_tex/AABB_tree_ref/AABB_segment_primitive.tex +++ b/AABB_tree/doc_tex/AABB_tree_ref/AABB_segment_primitive.tex @@ -1,5 +1,5 @@ -\begin{ccRefClass}{AABB_segment_primitive} +\begin{ccRefClass}{AABB_segment_primitive} \ccDefinition @@ -10,7 +10,7 @@ The iterator from which the primitive is built should not be invalided while the \ccParameters \ccc{Iterator} is a model of Forward Iterator concept, with \ccc{value_type} being \ccc{CGAL::Segment_3}.\\ -\ccc{cache_datum}: either \ccc{CGAL::Tag_true} or \ccc{CGAL::Tag_false}. In the former case, the datum is stored in the primitive, while in the latter it is constructed on the fly to reduce +\ccc{CacheDatum}: either \ccc{CGAL::Tag_true} or \ccc{CGAL::Tag_false}. In the former case, the datum is stored in the primitive, while in the latter it is constructed on the fly to reduce the memory footprint. The default is \ccc{CGAL::Tag_false} (datum is not stored). \ccInclude{CGAL/AABB_segment_primitive.h} @@ -31,10 +31,10 @@ the memory footprint. The default is \ccc{CGAL::Tag_false} (datum is not stored) \ccSeeAlso \ccc{AABBPrimitive},\\ -\ccc{AABB_primitive},\\ -\ccc{AABB_triangle_primitive},\\ -\ccc{AABB_HalfedgeGraph_segment_primitive},\\ -\ccc{AABB_FaceGraph_triangle_primitive}. +\ccc{AABB_primitive},\\ +\ccc{AABB_triangle_primitive},\\ +\ccc{AABB_HalfedgeGraph_segment_primitive},\\ +\ccc{AABB_FaceGraph_triangle_primitive}. \end{ccRefClass} diff --git a/AABB_tree/doc_tex/AABB_tree_ref/AABB_triangle_primitive.tex b/AABB_tree/doc_tex/AABB_tree_ref/AABB_triangle_primitive.tex index f4939ee8e9c..28159e387db 100644 --- a/AABB_tree/doc_tex/AABB_tree_ref/AABB_triangle_primitive.tex +++ b/AABB_tree/doc_tex/AABB_tree_ref/AABB_triangle_primitive.tex @@ -1,5 +1,5 @@ -\begin{ccRefClass}{AABB_triangle_primitive} +\begin{ccRefClass}{AABB_triangle_primitive} \ccDefinition @@ -10,7 +10,7 @@ The iterator from which the primitive is built should not be invalided while the \ccParameters \ccc{Iterator} is a model of Forward Iterator concept, with \ccc{value_type} being \ccc{CGAL::Triangle_3}.\\ -\ccc{cache_datum}: either \ccc{CGAL::Tag_true} or \ccc{CGAL::Tag_false}. In the former case, the datum is stored in the primitive, while in the latter it is constructed on the fly to reduce +\ccc{CacheDatum}: either \ccc{CGAL::Tag_true} or \ccc{CGAL::Tag_false}. In the former case, the datum is stored in the primitive, while in the latter it is constructed on the fly to reduce the memory footprint. The default is \ccc{CGAL::Tag_false} (datum is not stored). \ccInclude{CGAL/AABB_triangle_primitive.h} @@ -31,10 +31,10 @@ the memory footprint. The default is \ccc{CGAL::Tag_false} (datum is not stored) \ccSeeAlso \ccc{AABBPrimitive},\\ -\ccc{AABB_primitive},\\ -\ccc{AABB_segment_primitive},\\ -\ccc{AABB_HalfedgeGraph_segment_primitive},\\ -\ccc{AABB_FaceGraph_triangle_primitive}. +\ccc{AABB_primitive},\\ +\ccc{AABB_segment_primitive},\\ +\ccc{AABB_HalfedgeGraph_segment_primitive},\\ +\ccc{AABB_FaceGraph_triangle_primitive}. \end{ccRefClass} diff --git a/AABB_tree/doc_tex/AABB_tree_ref/introduction.tex b/AABB_tree/doc_tex/AABB_tree_ref/introduction.tex index a8370f8df79..957f6961739 100644 --- a/AABB_tree/doc_tex/AABB_tree_ref/introduction.tex +++ b/AABB_tree/doc_tex/AABB_tree_ref/introduction.tex @@ -14,8 +14,8 @@ \subsection*{Classes} \ccRefIdfierPage{CGAL::AABB_traits} \\ \ccRefIdfierPage{CGAL::AABB_tree} \\ -\ccRefIdfierPage{CGAL::AABB_triangle_primitive}\\ -\ccRefIdfierPage{CGAL::AABB_segment_primitive}\\ -\ccRefIdfierPage{CGAL::AABB_primitive}\\ -\ccRefIdfierPage{CGAL::AABB_HalfedgeGraph_segment_primitive}\\ -\ccRefIdfierPage{AABB_FaceGraph_triangle_primitive} \ No newline at end of file +\ccRefIdfierPage{CGAL::AABB_triangle_primitive}\\ +\ccRefIdfierPage{CGAL::AABB_segment_primitive}\\ +\ccRefIdfierPage{CGAL::AABB_primitive}\\ +\ccRefIdfierPage{CGAL::AABB_HalfedgeGraph_segment_primitive}\\ +\ccRefIdfierPage{AABB_FaceGraph_triangle_primitive} \ No newline at end of file diff --git a/AABB_tree/include/CGAL/AABB_FaceGraph_triangle_primitive.h b/AABB_tree/include/CGAL/AABB_FaceGraph_triangle_primitive.h index 58db4c65e02..ee5e2492c76 100644 --- a/AABB_tree/include/CGAL/AABB_FaceGraph_triangle_primitive.h +++ b/AABB_tree/include/CGAL/AABB_FaceGraph_triangle_primitive.h @@ -43,17 +43,17 @@ namespace CGAL { * This parameter is useless for the moment and will be useful in an upcoming release of \cgal. *\tparam OneFaceGraphPerTree must be set to `CGAL::Default` * This parameter is useless for the moment and will be useful in an upcoming release of \cgal. - *\tparam cache_datum is either `CGAL::Tag_true` or `CGAL::Tag_false`. In the former case, the datum is stored + *\tparam CacheDatum is either `CGAL::Tag_true` or `CGAL::Tag_false`. In the former case, the datum is stored * in the primitive, while in the latter it is constructed on the fly to reduce the memory footprint. * The default is `CGAL::Tag_false` (datum is not stored). *\sa `AABBPrimitive` - *\sa `AABB_primitive` - *\sa `AABB_HalfedgeGraph_segment_primitive` + *\sa `AABB_primitive` + *\sa `AABB_HalfedgeGraph_segment_primitive` */ template < class FaceGraph, class VertexPointPMap = Default, class OneFaceGraphPerTree = Default, - class cache_datum=Tag_false > + class CacheDatum=Tag_false > class AABB_FaceGraph_triangle_primitive #ifndef DOXYGEN_RUNNING : public AABB_primitive< typename boost::mpl::if_< @@ -64,7 +64,7 @@ class AABB_FaceGraph_triangle_primitive Triangle_from_facet_handle_property_map, One_point_from_facet_handle_property_map, Tag_true, - cache_datum > + CacheDatum > #endif { typedef typename boost::mpl::if_< @@ -78,7 +78,7 @@ class AABB_FaceGraph_triangle_primitive Triangle_property_map, Point_property_map, Tag_true, - cache_datum > Base; + CacheDatum > Base; public: #ifdef DOXYGEN_RUNNING diff --git a/AABB_tree/include/CGAL/AABB_HalfedgeGraph_segment_primitive.h b/AABB_tree/include/CGAL/AABB_HalfedgeGraph_segment_primitive.h index d6669ad2009..9728cc1f9c6 100644 --- a/AABB_tree/include/CGAL/AABB_HalfedgeGraph_segment_primitive.h +++ b/AABB_tree/include/CGAL/AABB_HalfedgeGraph_segment_primitive.h @@ -56,25 +56,25 @@ namespace CGAL { * common `HalfedgeGraph` and some data will be factorized so that the size of * the primitive is reduced. In the latter case, the primitives can be from * different graphs and extra storage is required in the primitives. The default is `CGAL::Tag_true`. - * \tparam cache_datum is either `CGAL::Tag_true` or `CGAL::Tag_false`. In the former case, the datum is + * \tparam CacheDatum is either `CGAL::Tag_true` or `CGAL::Tag_false`. In the former case, the datum is * stored in the primitive, while in the latter it is constructed on the fly to reduce * the memory footprint. The default is `CGAL::Tag_false` (datum is not stored). * * \sa `AABBPrimitive` - * \sa `AABB_primitive` - * \sa `AABB_FaceGraph_triangle_primitive` + * \sa `AABB_primitive` + * \sa `AABB_FaceGraph_triangle_primitive` */ template < class HalfedgeGraph, class VertexPointPMap = typename boost::property_map< HalfedgeGraph, vertex_point_t>::type, class OneHalfedgeGraphPerTree = Tag_true, - class cache_datum = Tag_false > + class CacheDatum = Tag_false > class AABB_HalfedgeGraph_segment_primitive #ifndef DOXYGEN_RUNNING : public AABB_primitive< typename boost::graph_traits::edge_descriptor, Segment_from_edge_descriptor_property_map, Source_point_from_edge_descriptor, OneHalfedgeGraphPerTree, - cache_datum > + CacheDatum > #endif { typedef typename boost::graph_traits::edge_descriptor Id_; @@ -85,7 +85,7 @@ class AABB_HalfedgeGraph_segment_primitive Segment_property_map, Point_property_map, Tag_true, - cache_datum > Base; + CacheDatum > Base; public: diff --git a/AABB_tree/include/CGAL/AABB_primitive.h b/AABB_tree/include/CGAL/AABB_primitive.h index 69abefad51c..037e60ed99c 100644 --- a/AABB_tree/include/CGAL/AABB_primitive.h +++ b/AABB_tree/include/CGAL/AABB_primitive.h @@ -68,22 +68,22 @@ public: * case, the property maps will be stored in the traits class, while * in the latter they will be stored in the primitive * (which increases the size of each primitive). - * \tparam cache_datum either `CGAL::Tag_true` or `CGAL::Tag_false`. In the former case, + * \tparam CacheDatum either `CGAL::Tag_true` or `CGAL::Tag_false`. In the former case, * the datum is stored in the primitive, while in the latter * it is constructed on the fly to reduce the memory footprint. * The default is `CGAL::Tag_false` (datum is not stored). * * \sa `AABBPrimitive` - * \sa `AABB_segment_primitive` - * \sa `AABB_triangle_primitive` - * \sa `AABB_HalfedgeGraph_segment_primitive` - * \sa `AABB_FaceGraph_triangle_primitive` + * \sa `AABB_segment_primitive` + * \sa `AABB_triangle_primitive` + * \sa `AABB_HalfedgeGraph_segment_primitive` + * \sa `AABB_FaceGraph_triangle_primitive` */ template < class Id, class ObjectPropertyMap, class PointPropertyMap, class ExternalPropertyMaps, - class cache_datum> + class CacheDatum> struct AABB_primitive { /// \name Types @@ -126,7 +126,7 @@ template < class Id, class ObjectPropertyMap, class PointPropertyMap, class ExternalPropertyMaps, - class cache_datum> + class CacheDatum> class AABB_primitive; diff --git a/AABB_tree/include/CGAL/AABB_segment_primitive.h b/AABB_tree/include/CGAL/AABB_segment_primitive.h index 6dafc274081..79579285d43 100644 --- a/AABB_tree/include/CGAL/AABB_segment_primitive.h +++ b/AABB_tree/include/CGAL/AABB_segment_primitive.h @@ -63,34 +63,34 @@ namespace internal { * and returning its source as a type convertible to `Point_3`. * In addition `Construct_source_3` must support the result_of protocol. * \tparam Iterator is a model of `ForwardIterator` with its value type convertible to `GeomTraits::Segment_3` - * \tparam cache_datum is either `CGAL::Tag_true` or `CGAL::Tag_false`. In the former case, + * \tparam CacheDatum is either `CGAL::Tag_true` or `CGAL::Tag_false`. In the former case, * the datum is stored in the primitive, while in the latter it is * constructed on the fly to reduce the memory footprint. * The default is `CGAL::Tag_false` (datum is not stored). * * \sa `AABBPrimitive` - * \sa `AABB_primitive` - * \sa `AABB_triangle_primitive` - * \sa `AABB_HalfedgeGraph_segment_primitive` - * \sa `AABB_FaceGraph_triangle_primitive` + * \sa `AABB_primitive` + * \sa `AABB_triangle_primitive` + * \sa `AABB_HalfedgeGraph_segment_primitive` + * \sa `AABB_FaceGraph_triangle_primitive` */ template < class GeomTraits, class Iterator, - class cache_datum=Tag_false> + class CacheDatum=Tag_false> class AABB_segment_primitive #ifndef DOXYGEN_RUNNING : public AABB_primitive< Iterator, Input_iterator_property_map, internal::Source_of_segment_3_iterator_property_map, Tag_false, - cache_datum > + CacheDatum > #endif { typedef AABB_primitive< Iterator, Input_iterator_property_map, internal::Source_of_segment_3_iterator_property_map, Tag_false, - cache_datum > Base; + CacheDatum > Base; public: ///Constructor from an iterator AABB_segment_primitive(Iterator it) : Base(it){} diff --git a/AABB_tree/include/CGAL/AABB_triangle_primitive.h b/AABB_tree/include/CGAL/AABB_triangle_primitive.h index 1d05fc4aed2..5628a83ef03 100644 --- a/AABB_tree/include/CGAL/AABB_triangle_primitive.h +++ b/AABB_tree/include/CGAL/AABB_triangle_primitive.h @@ -63,34 +63,34 @@ namespace internal { * and an integer as parameters and returning a triangle point as a type convertible to `Point_3`. * In addition `Construct_vertex_3` must support the result_of protocol. * \tparam Iterator is a model of `ForwardIterator` with its value type convertible to `GeomTraits::Triangle_3` - * \tparam cache_datum is either `CGAL::Tag_true` or `CGAL::Tag_false`. In the former case, + * \tparam CacheDatum is either `CGAL::Tag_true` or `CGAL::Tag_false`. In the former case, * the datum is stored in the primitive, while in the latter it is * constructed on the fly to reduce the memory footprint. * The default is `CGAL::Tag_false` (datum is not stored). * * \sa `AABBPrimitive` - * \sa `AABB_primitive` - * \sa `AABB_segment_primitive` - * \sa `AABB_HalfedgeGraph_segment_primitive` - * \sa `AABB_FaceGraph_triangle_primitive` + * \sa `AABB_primitive` + * \sa `AABB_segment_primitive` + * \sa `AABB_HalfedgeGraph_segment_primitive` + * \sa `AABB_FaceGraph_triangle_primitive` */ template < class GeomTraits, class Iterator, - class cache_datum=Tag_false> + class CacheDatum=Tag_false> class AABB_triangle_primitive #ifndef DOXYGEN_RUNNING : public AABB_primitive< Iterator, Input_iterator_property_map, internal::Point_from_triangle_3_iterator_property_map, Tag_false, - cache_datum > + CacheDatum > #endif { typedef AABB_primitive< Iterator, Input_iterator_property_map, internal::Point_from_triangle_3_iterator_property_map, Tag_false, - cache_datum > Base; + CacheDatum > Base; public: ///Constructor from an iterator AABB_triangle_primitive(Iterator it) : Base(it){}