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

Merge branch 'BGL-fix_internal_struct_names-sloriot' into releases/CGAL-4.5-branch 

Tested in CGAL-4.5-Ic-146

  Approved by the release manager
This commit is contained in:
Sébastien Loriot 2014-10-03 17:20:49 +02:00
parent 434f27516a f87046546e
commit 926d0fefc8
1 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
BGL/include/CGAL/boost/graph/iterator.h
View File

@ -34,26 +34,6 @@ namespace CGAL {
namespace internal {
template <typename G>
struct Opposite {
const G* g;
Opposite()
: g(NULL)
{}
Opposite(const G& g)
: g(&g)
{}
typedef typename boost::graph_traits<G>::halfedge_descriptor result_type;
typedef typename boost::graph_traits<G>::halfedge_descriptor argument_type;
result_type operator()(argument_type h) const
{
return opposite(h, *g);
}
};
template <typename G>
struct Edge {
const G* g;
@ -496,11 +476,11 @@ class Halfedge_around_target_circulator;
template <typename Graph>
class Halfedge_around_source_circulator
#ifndef DOXYGEN_RUNNING
: public boost::transform_iterator<internal::Opposite<Graph>, Halfedge_around_target_circulator<Graph> >
: public boost::transform_iterator<internal::OppositeHalfedge<Graph>, Halfedge_around_target_circulator<Graph> >
#endif
{
#ifndef DOXYGEN_RUNNING
typedef boost::transform_iterator<internal::Opposite<Graph>, Halfedge_around_target_circulator<Graph> > Base;
typedef boost::transform_iterator<internal::OppositeHalfedge<Graph>, Halfedge_around_target_circulator<Graph> > Base;
typedef typename boost::graph_traits<Graph>::halfedge_descriptor halfedge_descriptor;
typedef typename boost::graph_traits<Graph>::vertex_descriptor vertex_descriptor;
#endif
@ -516,11 +496,11 @@ public:
{}
Halfedge_around_source_circulator(halfedge_descriptor hd, const Graph& g)
: Base(Halfedge_around_target_circulator<Graph>(hd,g), internal::Opposite<Graph>(g))
: Base(Halfedge_around_target_circulator<Graph>(hd,g), internal::OppositeHalfedge<Graph>(g))
{}
Halfedge_around_source_circulator(vertex_descriptor vd, const Graph& g)
: Base(Halfedge_around_target_circulator<Graph>(halfedge(vd,g),g), internal::Opposite<Graph>(g))
: Base(Halfedge_around_target_circulator<Graph>(halfedge(vd,g),g), internal::OppositeHalfedge<Graph>(g))
{}
};