rename cache_primitive -> cache_datum

This commit is contained in:
Sébastien Loriot 2012-05-10 16:18:33 +00:00
parent be1de01b22
commit 8a3d8e1d01
5 changed files with 15 additions and 15 deletions

View File

@ -34,14 +34,14 @@ namespace CGAL {
template < class FaceGraph,
class cache_primitive=Tag_false,
class cache_datum=Tag_false,
class Id_=typename FaceGraph::Face_handle //this one should be autodetected using face_descriptor
>
class AABB_FaceGraph_triangle_primitive : public AABB_primitive< Id_,
Triangle_from_facet_handle_property_map<FaceGraph>,
One_point_from_facet_handle_property_map<FaceGraph>,
cache_primitive >
cache_datum >
{
typedef Triangle_from_facet_handle_property_map<FaceGraph> Triangle_property_map;
typedef One_point_from_facet_handle_property_map<FaceGraph> Point_property_map;
@ -49,7 +49,7 @@ class AABB_FaceGraph_triangle_primitive : public AABB_primitive< Id_,
typedef AABB_primitive< Id_,
Triangle_property_map,
Point_property_map,
cache_primitive > Base;
cache_datum > Base;
public:
// constructors

View File

@ -52,13 +52,13 @@ namespace internal{
}
template < class HalfedgeGraph,
class cache_primitive=Tag_false,
class cache_datum=Tag_false,
class Id_=typename boost::graph_traits<HalfedgeGraph>::edge_descriptor
>
class AABB_HalfedgeGraph_segment_primitive : public AABB_primitive< Id_,
Segment_from_edge_descriptor_property_map<HalfedgeGraph>,
Source_point_from_edge_descriptor<HalfedgeGraph>,
cache_primitive >
cache_datum >
{
typedef Segment_from_edge_descriptor_property_map<HalfedgeGraph> Triangle_property_map;
typedef Source_point_from_edge_descriptor<HalfedgeGraph> Point_property_map;
@ -66,7 +66,7 @@ class AABB_HalfedgeGraph_segment_primitive : public AABB_primitive< Id_,
typedef AABB_primitive< Id_,
Triangle_property_map,
Point_property_map,
cache_primitive > Base;
cache_datum > Base;
public:
// constructors

View File

@ -33,12 +33,12 @@ namespace CGAL {
template < class Id_,
class ObjectPropertyMap,
class PointPropertyMap,
class cache_primitive=Tag_false >
class cache_datum=Tag_false >
class AABB_primitive :
public internal::Primitive_caching< Id_, ObjectPropertyMap, cache_primitive >
public internal::Primitive_caching< Id_, ObjectPropertyMap, cache_datum >
{
// types
typedef internal::Primitive_caching<Id_, ObjectPropertyMap, cache_primitive> Primitive_base;
typedef internal::Primitive_caching<Id_, ObjectPropertyMap, cache_datum> Primitive_base;
public:
typedef typename boost::property_traits< ObjectPropertyMap >::value_type Datum; //datum type

View File

@ -55,16 +55,16 @@ namespace internal {
template < class Iterator,
class cache_primitive=Tag_false>
class cache_datum=Tag_false>
class AABB_segment_primitive : public AABB_primitive< Iterator,
Input_iterator_property_map<Iterator>,
internal::Source_of_segment_3_iterator_property_map<Iterator>,
cache_primitive >
cache_datum >
{
typedef AABB_primitive< Iterator,
Input_iterator_property_map<Iterator>,
internal::Source_of_segment_3_iterator_property_map<Iterator>,
cache_primitive > Base;
cache_datum > Base;
public:
// constructors
AABB_segment_primitive(Iterator it) : Base(it){}

View File

@ -54,16 +54,16 @@ namespace internal {
template < class Iterator,
class cache_primitive=Tag_false>
class cache_datum=Tag_false>
class AABB_triangle_primitive : public AABB_primitive< Iterator,
Input_iterator_property_map<Iterator>,
internal::Point_from_triangle_3_iterator_property_map<Iterator>,
cache_primitive >
cache_datum >
{
typedef AABB_primitive< Iterator,
Input_iterator_property_map<Iterator>,
internal::Point_from_triangle_3_iterator_property_map<Iterator>,
cache_primitive > Base;
cache_datum > Base;
public:
// constructors
AABB_triangle_primitive(Iterator it) : Base(it){}