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

Fix in halfedge_graph_traits to work-around BGL const-correctness flaw.

This commit is contained in:
Fernando Cacciola 2008-05-21 17:13:31 +00:00
parent c79aacdc8c
commit 572c2e9301
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
BGL/include/CGAL/boost/graph/halfedge_graph_traits_HalfedgeDS.h
View File

@ -70,19 +70,6 @@ public :
typedef typename HDS::Vertex::Point Point ;
};
template <class HDS_>
struct HDS_halfedge_graph_traits<HDS_ const>
{
public :
typedef HDS_ HDS;
typedef HDS_all_undirected_edges_const_iterator<HDS> undirected_edge_iterator;
typedef typename HDS::Vertex::Point Point ;
};
CGAL_END_NAMESPACE
#endif // CGAL_BOOST_GRAPH_HALFEDGE_GRAPH_TRAITS_HALFEDGEDS_H

20
BGL/include/CGAL/boost/graph/halfedge_graph_traits_Polyhedron_3.h
View File

@ -32,6 +32,18 @@
# define CGAL_HDS_PARAM_ class HDS
#endif
//
// NOTE: The BGL algorithms are NOT const-correct: i.e., they take a "G const&"
// but instantiate "graph_traits<G>" instead of "graph_traits<G const>"
// This is known Boost bug which will eventually be fixed, but in the meantime we need
// to coerce both const and non-const specializations.
// That is, HDS_graph_traits<G const> is really the same as HDS_graph_traits<G>
// so graph_traits<G> is also the same as graph_traits<G const>.
// Therefore, while, for instance, "graph_traits<G const>::vertex_descriptor"
// is conceptually const-correct, it actually corresponds to the non-const handle,
// hence the const_cast<> used below in the functions implementation.
//
CGAL_BEGIN_NAMESPACE
//
@ -39,7 +51,7 @@ CGAL_BEGIN_NAMESPACE
//
template<class Gt, class I, CGAL_HDS_PARAM_, class A>
struct halfedge_graph_traits< CGAL::Polyhedron_3<Gt,I,HDS,A> const >
: CGAL::HDS_halfedge_graph_traits< CGAL::Polyhedron_3<Gt,I,HDS,A> const>
: CGAL::HDS_halfedge_graph_traits< CGAL::Polyhedron_3<Gt,I,HDS,A> > // See NOTE above!
{
};
@ -50,7 +62,8 @@ inline std::pair<typename halfedge_graph_traits< Polyhedron_3<Gt,I,HDS,A> const>
undirected_edges( Polyhedron_3<Gt,I,HDS,A> const& p )
{
typedef typename halfedge_graph_traits< Polyhedron_3<Gt,I,HDS,A> const>::undirected_edge_iterator Iter;
return std::make_pair( Iter(p.edges_begin()), Iter(p.edges_end()) );
CGAL::Polyhedron_3<Gt,I,HDS,A>& ncp = const_cast<CGAL::Polyhedron_3<Gt,I,HDS,A>&>(p);
return std::make_pair( Iter(ncp.edges_begin()), Iter(ncp.edges_end()) );
}
template<class Gt, class I, CGAL_HDS_PARAM_, class A>
@ -118,7 +131,8 @@ inline std::pair<typename halfedge_graph_traits< Polyhedron_3<Gt,I,HDS,A> >::und
undirected_edges( Polyhedron_3<Gt,I,HDS,A>& p )
{
typedef typename halfedge_graph_traits< Polyhedron_3<Gt,I,HDS,A> >::undirected_edge_iterator Iter;
return std::make_pair( Iter(p.edges_begin()), Iter(p.edges_end()) );
CGAL::Polyhedron_3<Gt,I,HDS,A>& ncp = const_cast<CGAL::Polyhedron_3<Gt,I,HDS,A>&>(p);
return std::make_pair( Iter(ncp.edges_begin()), Iter(ncp.edges_end()) );
}
template<class Gt, class I, CGAL_HDS_PARAM_, class A>