diff --git a/BGL/include/CGAL/boost/graph/named_function_params.h b/BGL/include/CGAL/boost/graph/named_function_params.h index 7763ac2e1fd..d0593a174a1 100644 --- a/BGL/include/CGAL/boost/graph/named_function_params.h +++ b/BGL/include/CGAL/boost/graph/named_function_params.h @@ -250,14 +250,6 @@ namespace CGAL { return Params(p, *this); } - template - cgal_bgl_named_params - halfedge_is_border_map(const IsBorderMap& p) const - { - typedef cgal_bgl_named_params Params; - return Params(p, *this); - } - template cgal_bgl_named_params visitor(const Visitor& p) const @@ -376,15 +368,7 @@ namespace CGAL { typedef cgal_bgl_named_params Params; return Params(pmap); } - - template - cgal_bgl_named_params - halfedge_is_border_map(IsBorderMap const& p) - { - typedef cgal_bgl_named_params Params; - return Params(p); - } - + template cgal_bgl_named_params visitor(const Visitor& p) diff --git a/BGL/include/CGAL/boost/graph/properties.h b/BGL/include/CGAL/boost/graph/properties.h index c2b0e1c38fc..b104c5addf2 100644 --- a/BGL/include/CGAL/boost/graph/properties.h +++ b/BGL/include/CGAL/boost/graph/properties.h @@ -44,7 +44,6 @@ enum vertex_external_index_t { vertex_external_index } ; /// A property tag which refers to the property /// of a halfedge of being a border halfedge. -enum halfedge_is_border_t { halfedge_is_border }; enum edge_external_index_t { edge_external_index } ; /// A property tag which identifies the *index* property of @@ -100,8 +99,6 @@ using boost::halfedge_index_t; using boost::halfedge_index; using boost::halfedge_external_index_t; using boost::halfedge_external_index; -using boost::halfedge_is_border_t; -using boost::halfedge_is_border; using boost::edge_external_index_t; using boost::edge_external_index; using boost::face_index_t; diff --git a/BGL/include/CGAL/boost/graph/properties_PolyMesh_ArrayKernelT.h b/BGL/include/CGAL/boost/graph/properties_PolyMesh_ArrayKernelT.h index bd2faec1aa3..3b9871de824 100644 --- a/BGL/include/CGAL/boost/graph/properties_PolyMesh_ArrayKernelT.h +++ b/BGL/include/CGAL/boost/graph/properties_PolyMesh_ArrayKernelT.h @@ -51,36 +51,6 @@ public: private: const OpenMesh::PolyMesh_ArrayKernelT& sm_; }; - - -template -class OM_is_border_pmap -{ -public: - typedef boost::read_write_property_map_tag category; - typedef bool value_type; - typedef bool reference; - typedef Key key_type; - - OM_is_border_pmap(const OpenMesh::PolyMesh_ArrayKernelT& sm) - : sm_(sm) - {} - - friend reference get(OM_is_border_pmap pm, key_type k) - { - return pm.sm_.is_boundary(k); - } - - friend void put(OM_is_border_pmap pm, key_type k , bool b) - { - if(b){ - const_cast& >(pm.sm_).set_face_handle(k, typename OpenMesh::PolyMesh_ArrayKernelT::FaceHandle()); - } - } - -private: - const OpenMesh::PolyMesh_ArrayKernelT& sm_; -}; template class OM_index_pmap : public boost::put_get_helper > @@ -224,31 +194,6 @@ struct property_map, boost::vertex_point_t > typedef type const_type; }; - -// -// vertex_is_border -// - -template -struct property_map, CGAL::vertex_is_border_t > -{ - typedef CGAL::OM_is_border_pmap >::vertex_descriptor> - type; - typedef type const_type; -}; - -// -// halfedge_is_border -// - -template -struct property_map, CGAL::halfedge_is_border_t > -{ - typedef CGAL::OM_is_border_pmap >::halfedge_descriptor> - type; - typedef type const_type; -}; - } // namespace boost namespace boost { @@ -306,21 +251,6 @@ get(boost::vertex_point_t, const OpenMesh::PolyMesh_ArrayKernelT& g) return CGAL::OM_point_pmap(g); } - -template -CGAL::OM_is_border_pmap >::vertex_descriptor> -get(boost::vertex_is_border_t, const OpenMesh::PolyMesh_ArrayKernelT& g) -{ - return CGAL::OM_is_border_pmap >::vertex_descriptor>(g); -} - -template -CGAL::OM_is_border_pmap >::halfedge_descriptor> -get(boost::halfedge_is_border_t, const OpenMesh::PolyMesh_ArrayKernelT& g) -{ - return CGAL::OM_is_border_pmap >::halfedge_descriptor>(g); -} - // get for intrinsic properties #define CGAL_OM_INTRINSIC_PROPERTY(RET, PROP, TYPE) \ template \ @@ -336,7 +266,6 @@ get(boost::halfedge_is_border_t, const OpenMesh::PolyMesh_ArrayKernelT& g) // CGAL_OM_INTRINSIC_PROPERTY(std::size_t, boost::halfedge_index_t, face_descriptor) CGAL_OM_INTRINSIC_PROPERTY(typename CGAL::Exact_predicates_inexact_constructions_kernel::Point_3, boost::vertex_point_t, vertex_descriptor) CGAL_OM_INTRINSIC_PROPERTY(bool, boost::vertex_is_border_t, vertex_descriptor) - CGAL_OM_INTRINSIC_PROPERTY(bool, boost::halfedge_is_border_t, halfedge_descriptor) #undef CGAL_OM_INTRINSIC_PROPERTY diff --git a/BGL/test/BGL/graph_concept_OpenMesh.cpp b/BGL/test/BGL/graph_concept_OpenMesh.cpp index 50a6b8cd806..eeeb03ffdef 100644 --- a/BGL/test/BGL/graph_concept_OpenMesh.cpp +++ b/BGL/test/BGL/graph_concept_OpenMesh.cpp @@ -63,7 +63,6 @@ void concept_check_polyhedron() { boost::function_requires< boost::concepts::ReadablePropertyGraph >(); boost::function_requires< boost::concepts::ReadablePropertyGraph >(); // boost::function_requires< boost::concepts::ReadablePropertyGraph >(); - boost::function_requires< boost::concepts::ReadablePropertyGraph >(); // null boost::graph_traits::null_vertex(); boost::graph_traits::null_face(); diff --git a/BGL/test/BGL/graph_concept_Polyhedron_3.cpp b/BGL/test/BGL/graph_concept_Polyhedron_3.cpp index 2eef3e8c5cc..e7aac1dc633 100644 --- a/BGL/test/BGL/graph_concept_Polyhedron_3.cpp +++ b/BGL/test/BGL/graph_concept_Polyhedron_3.cpp @@ -51,8 +51,6 @@ void concept_check_polyhedron() { boost::function_requires< boost::concepts::PropertyGraph< Polyhedron, halfedge_descriptor, CGAL::halfedge_index_t> >(); - boost::function_requires< boost::concepts::ReadablePropertyGraph< - Polyhedron, halfedge_descriptor, CGAL::halfedge_is_border_t> >(); boost::function_requires< boost::concepts::ReadablePropertyGraph< Polyhedron, edge_descriptor, boost::edge_index_t> >(); boost::function_requires< boost::concepts::ReadablePropertyGraph<