songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix sm_bgl.cpp I am not yet lucky with the API, as member functions return a pair

This commit is contained in:
Andreas Fabri 2014-12-11 09:12:34 +01:00
parent 294c047ca8
commit 705cb65c1c
2 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
BGL/include/CGAL/boost/graph/properties_Surface_mesh.h
View File

@ -90,26 +90,7 @@ struct property_map<CGAL::Surface_mesh<Point>, boost::vertex_property_t<T> >
typedef type const_type;
};
template <typename Point, typename T>
typename property_map<CGAL::Surface_mesh<Point>, boost::vertex_property_t<T> >::const_type
get(boost::vertex_property_t<T> vprop, const CGAL::Surface_mesh<Point>& sm)
{
return sm.template get_property_map<typename CGAL::Surface_mesh<Point>::Vertex_index, T>(vprop.s);
}
template <typename Point, typename T>
typename property_map<CGAL::Surface_mesh<Point>, boost::vertex_property_t<T> >::const_type
add(boost::vertex_property_t<T> vprop, CGAL::Surface_mesh<Point>& sm)
{
return sm.template add_property_map<typename CGAL::Surface_mesh<Point>::Vertex_index, T>(vprop.s, vprop.t);
}
template <typename K, typename V, typename P>
void
remove(typename CGAL::Surface_mesh<P>::template Property_map<K,V> pm, CGAL::Surface_mesh<P>& sm)
{
return sm.remove_property_map(pm);
}
#endif
@ -268,4 +249,30 @@ put(CGAL::vertex_point_t p, const CGAL::Surface_mesh<K>& g,
} // boost
#if 1
//
namespace CGAL {
template <typename Point, typename T>
typename boost::property_map<CGAL::Surface_mesh<Point>, boost::vertex_property_t<T> >::const_type
get(boost::vertex_property_t<T> vprop, const CGAL::Surface_mesh<Point>& sm)
{
return sm.template get_property_map<typename CGAL::Surface_mesh<Point>::Vertex_index, T>(vprop.s).first;
}
template <typename Point, typename T>
typename boost::property_map<CGAL::Surface_mesh<Point>, boost::vertex_property_t<T> >::const_type
add(boost::vertex_property_t<T> vprop, CGAL::Surface_mesh<Point>& sm)
{
return sm.template add_property_map<typename CGAL::Surface_mesh<Point>::Vertex_index, T>(vprop.s, vprop.t).first;
}
template <typename Pmap,typename P>
void
remove(Pmap pm, CGAL::Surface_mesh<P>& sm)
{
return sm.remove_property_map(pm);
}
} // namespace CGAL
#endif
#endif /* CGAL_PROPERTIES_SURFACE_MESH_H */

2
Surface_mesh/examples/Surface_mesh/sm_bgl.cpp
View File

@ -42,7 +42,7 @@ int main()
std::cerr << "Error: vertex property map named 'visited' already exists\n";
}
remove_property(vs_pm, m);
remove(vs_pm, m);
return 0;
}