From ed6ac1f4fd8984227ebeb45525fa51a2a43c15d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= <sloriot.ml@gmail.com>
Date: Fri, 4 May 2012 14:49:27 +0000
Subject: [PATCH] rename Property maps template parameter set primitive caching
 to false by default

---
 AABB_tree/include/CGAL/AABB_segment_primitive.h    | 10 +++++-----
 AABB_tree/include/CGAL/AABB_triangle_primitive.h   | 14 +++++++-------
 .../CGAL/internal/AABB_tree/Primitive_caching.h    |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/AABB_tree/include/CGAL/AABB_segment_primitive.h b/AABB_tree/include/CGAL/AABB_segment_primitive.h
index 6985fb1d1e5..3b3b97a3b4f 100644
--- a/AABB_tree/include/CGAL/AABB_segment_primitive.h
+++ b/AABB_tree/include/CGAL/AABB_segment_primitive.h
@@ -33,13 +33,13 @@ namespace CGAL {
 
 template <class GeomTraits, 
           class Iterator,
-          class PropertyMap=boost::typed_identity_property_map<typename GeomTraits::Segment_3>,
-          bool cache_primitive=true>
+          class SegmentPropertyMap=boost::typed_identity_property_map<typename GeomTraits::Segment_3>,
+          bool cache_primitive=false>
 class AABB_segment_primitive :
-  public internal::Primitive_caching<typename GeomTraits::Segment_3,Iterator,PropertyMap,cache_primitive>
+  public internal::Primitive_caching<typename GeomTraits::Segment_3,Iterator,SegmentPropertyMap,cache_primitive>
 {
         // types
-        typedef internal::Primitive_caching<typename GeomTraits::Segment_3,Iterator,PropertyMap,cache_primitive> Base;
+        typedef internal::Primitive_caching<typename GeomTraits::Segment_3,Iterator,SegmentPropertyMap,cache_primitive> Base;
 public:
         typedef typename GeomTraits::Point_3 Point; // point type
         typedef typename GeomTraits::Segment_3 Datum; // datum type
@@ -51,7 +51,7 @@ private:
 public:
         // constructors
         AABB_segment_primitive() {}
-        AABB_segment_primitive(Id it,PropertyMap pmap=PropertyMap())
+        AABB_segment_primitive(Id it,SegmentPropertyMap pmap=SegmentPropertyMap())
                 : m_it(it)
         {
           this->set_primitive(it,pmap);
diff --git a/AABB_tree/include/CGAL/AABB_triangle_primitive.h b/AABB_tree/include/CGAL/AABB_triangle_primitive.h
index f5808f606af..46ae6e265ed 100644
--- a/AABB_tree/include/CGAL/AABB_triangle_primitive.h
+++ b/AABB_tree/include/CGAL/AABB_triangle_primitive.h
@@ -33,13 +33,13 @@ namespace CGAL {
 
 template <class GeomTraits, 
           class Iterator,
-          class PropertyMap=boost::typed_identity_property_map<typename GeomTraits::Triangle_3>,
-          bool cache_primitive=true>
+          class TrianglePropertyMap=boost::typed_identity_property_map<typename GeomTraits::Triangle_3>,
+          bool cache_primitive=false>
 class AABB_triangle_primitive :
-  public internal::Primitive_caching<typename GeomTraits::Triangle_3,Iterator,PropertyMap,cache_primitive>
+  public internal::Primitive_caching<typename GeomTraits::Triangle_3,Iterator,TrianglePropertyMap,cache_primitive>
 {
         // types
-        typedef internal::Primitive_caching<typename GeomTraits::Triangle_3,Iterator,PropertyMap,cache_primitive> Base;
+        typedef internal::Primitive_caching<typename GeomTraits::Triangle_3,Iterator,TrianglePropertyMap,cache_primitive> Primitive_base;
 public:
         typedef typename GeomTraits::Point_3 Point; // point type
         typedef typename GeomTraits::Triangle_3 Datum; // datum type
@@ -51,15 +51,15 @@ private:
 public:
         // constructors
         AABB_triangle_primitive() {}
-        AABB_triangle_primitive(Id it,PropertyMap pmap=PropertyMap())
+        AABB_triangle_primitive(Id it,TrianglePropertyMap t_pmap=TrianglePropertyMap())
                 : m_it(it)
         {
-          this->set_primitive(it,pmap);
+          this->set_primitive(it,t_pmap);
         }
 public:
         Id& id() { return m_it; }
         const Id& id() const { return m_it; }
-        typename Base::result_type datum() const {
+        typename Primitive_base::result_type datum() const {
           return this->get_primitive(m_it);
         }
 
diff --git a/AABB_tree/include/CGAL/internal/AABB_tree/Primitive_caching.h b/AABB_tree/include/CGAL/internal/AABB_tree/Primitive_caching.h
index ffed226945d..fc0571018bf 100644
--- a/AABB_tree/include/CGAL/internal/AABB_tree/Primitive_caching.h
+++ b/AABB_tree/include/CGAL/internal/AABB_tree/Primitive_caching.h
@@ -47,7 +47,7 @@ namespace internal{
   template <class Primitive,class Id,class PropertyMap>
   struct Primitive_caching<Primitive,Id,PropertyMap,false>
   {
-    typedef Primitive result_type;
+    typedef typename PropertyMap::reference result_type;
     PropertyMap pmap_;
     
     void set_primitive(Id,PropertyMap pmap){pmap_=pmap;}