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

use a wrapper to make sure the return type of get is instantiable 

the pb encountered comes from get called on a variant
This commit is contained in:
Sébastien Loriot 2015-03-17 16:02:52 +01:00
parent 2c73064343
commit ef2cef3eb4
1 changed files with 50 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
BGL/include/CGAL/boost/graph/Dual.h
View File

@ -90,18 +90,60 @@ struct graph_traits< const CGAL::Dual<P> >
: public graph_traits< CGAL::Dual<P> >
{};
namespace internal{
template <class G>
struct Dual_vertex_index_pmap{
typedef typename boost::property_map<G, boost::face_index_t>::type Property_map;
Property_map m_pmap;
typedef typename boost::graph_traits<G>::face_descriptor key_type;
typedef typename Property_map::value_type value_type;
typedef typename Property_map::reference reference;
typedef typename Property_map::category category;
Dual_vertex_index_pmap(const G& g)
: m_pmap( get(boost::face_index, g) )
{}
friend reference get(const Dual_vertex_index_pmap<G>& pmap, key_type fd) {
return get(pmap.m_pmap, fd);
}
};
template <class G>
struct Dual_face_index_pmap{
typedef typename boost::property_map<G, boost::vertex_index_t>::type Property_map;
Property_map m_pmap;
typedef typename boost::graph_traits<G>::vertex_descriptor key_type;
typedef typename Property_map::value_type value_type;
typedef typename Property_map::reference reference;
typedef typename Property_map::category category;
Dual_face_index_pmap(const G& g)
: m_pmap( get(boost::vertex_index, g) )
{}
friend reference get(const Dual_face_index_pmap<G>& pmap, key_type vd) {
return get(pmap.m_pmap, vd);
}
};
} //end of namespace internal
template <typename P>
struct property_map<CGAL::Dual<P>, boost::vertex_index_t>
{
typedef typename property_map<P, CGAL::face_index_t>::type type;
typedef typename property_map<P, CGAL::face_index_t>::const_type const_type;
typedef internal::Dual_vertex_index_pmap<P> type;
typedef internal::Dual_vertex_index_pmap<P> const_type;
};
template <typename P>
struct property_map<CGAL::Dual<P>, boost::face_index_t>
{
typedef typename property_map<P, boost::vertex_index_t>::type type;
typedef typename property_map<P, boost::vertex_index_t>::const_type const_type;
typedef internal::Dual_face_index_pmap<P> type;
typedef internal::Dual_face_index_pmap<P> const_type;
};
} // namespace boost
@ -110,20 +152,19 @@ struct property_map<CGAL::Dual<P>, boost::face_index_t>
namespace CGAL {
template <typename P>
typename boost::property_map<P, boost::face_index_t>::type
typename boost::internal::Dual_vertex_index_pmap<P>
get(boost::vertex_index_t, const Dual<P>& dual)
{
return get(CGAL::face_index, dual.primal());
return typename boost::internal::Dual_vertex_index_pmap<P>(dual.primal());
}
template <typename P>
typename boost::property_map<P, boost::vertex_index_t>::type
typename boost::internal::Dual_face_index_pmap<P>
get(boost::face_index_t, const Dual<P>& dual)
{
return get(boost::vertex_index, dual.primal());
return typename boost::internal::Dual_face_index_pmap<P>(dual.primal());
}
template <typename P>
typename boost::graph_traits<CGAL::Dual<P> >::vertices_size_type
num_vertices(const CGAL::Dual<P>& dual)