From d216c5dfb70d6cb28bc893c0e1f5f6e9df8d4968 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Thu, 16 Jun 2022 09:57:03 +0200 Subject: [PATCH] remove code already present in the property file --- .../graph/graph_traits_HalfedgeDS_default.h | 55 +------------------ .../graph/properties_HalfedgeDS_default.h | 9 ++- 2 files changed, 5 insertions(+), 59 deletions(-) diff --git a/HalfedgeDS/include/CGAL/boost/graph/graph_traits_HalfedgeDS_default.h b/HalfedgeDS/include/CGAL/boost/graph/graph_traits_HalfedgeDS_default.h index 4fa5be5b9cf..6d28e6c458e 100644 --- a/HalfedgeDS/include/CGAL/boost/graph/graph_traits_HalfedgeDS_default.h +++ b/HalfedgeDS/include/CGAL/boost/graph/graph_traits_HalfedgeDS_default.h @@ -443,29 +443,6 @@ num_faces(const HalfedgeDS_default& p) return p.size_of_faces(); } -template -struct HDS_property_map; - -template <> -struct HDS_property_map -{ - template - struct bind_ - { - typedef internal::Point_accessor< - typename boost::graph_traits< - HalfedgeDS_default - >::vertex_descriptor, - typename T::Point_3, typename T::Point_3&> type; - - typedef internal::Point_accessor< - typename boost::graph_traits< - HalfedgeDS_default - >::vertex_descriptor, - typename T::Point_3, const typename T::Point_3&> const_type; - }; -}; - template void reserve(HalfedgeDS_default& p, typename boost::graph_traits< HalfedgeDS_default const>::vertices_size_type nv, @@ -476,37 +453,7 @@ void reserve(HalfedgeDS_default& p, } }// namespace CGAL -namespace boost { -#define CGAL_PM_SPECIALIZATION(TAG) \ -template \ -struct property_map, TAG> \ -{\ - typedef typename CGAL::HDS_property_map:: \ - template bind_ map_gen; \ - typedef typename map_gen::type type; \ - typedef typename map_gen::const_type const_type; \ -}; +#include -CGAL_PM_SPECIALIZATION(vertex_point_t) - -#undef CGAL_PM_SPECIALIZATION - -} // namespace boost - -namespace CGAL { - -// generalized 2-ary get functions -template -typename boost::property_map< CGAL::HalfedgeDS_default, PropertyTag >::const_type -get(PropertyTag, CGAL::HalfedgeDS_default const&) -{ return typename boost::property_map< CGAL::HalfedgeDS_default, PropertyTag >::const_type(); } - -template -typename boost::property_map< CGAL::HalfedgeDS_default, PropertyTag >::type -get(PropertyTag, CGAL::HalfedgeDS_default&) -{ return typename boost::property_map< CGAL::HalfedgeDS_default, PropertyTag >::type(); } - - -} // namespace CGAL #endif diff --git a/HalfedgeDS/include/CGAL/boost/graph/properties_HalfedgeDS_default.h b/HalfedgeDS/include/CGAL/boost/graph/properties_HalfedgeDS_default.h index 3b3ab4ddf5f..d0d5a76afb8 100644 --- a/HalfedgeDS/include/CGAL/boost/graph/properties_HalfedgeDS_default.h +++ b/HalfedgeDS/include/CGAL/boost/graph/properties_HalfedgeDS_default.h @@ -108,7 +108,7 @@ struct HDS_property_map {}; } // namespace CGAL namespace CGAL { - /* + // generalized 2-ary get functions template typename boost::property_map, PropertyTag >::const_type @@ -119,7 +119,7 @@ template typename boost::property_map, PropertyTag >::type get(PropertyTag,CGAL::HalfedgeDS_default&) { return typename boost::property_map, PropertyTag >::type(); } -*/ + // generalized 3-ary get functions template typename boost::property_traits< typename boost::property_map, PropertyTag >::type >::reference @@ -212,8 +212,7 @@ struct HDS_property_map typedef type const_type; }; }; -/* -// already defined in line 448 ?? why not the same for Polyhedron? + template <> struct HDS_property_map { @@ -233,7 +232,7 @@ struct HDS_property_map typename Gt::Point_3, const typename Gt::Point_3&> const_type; }; }; -*/ + // // external indices //