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

cosmetic changes (indent, spaces, naming)

This commit is contained in:
Laurent Rineau 2023-04-27 12:04:02 +02:00
parent 53b438eeeb
commit 952d34c6ea
6 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
STL_Extension/include/CGAL/iterator.h
View File

@ -37,28 +37,28 @@
namespace CGAL { namespace CGAL {
template<typename I, typename VT = I> template<typename I, typename Value_type = I>
class Prevent_deref class Prevent_deref
: public boost::iterator_adaptor< : public boost::iterator_adaptor<
Prevent_deref<I,VT> Prevent_deref<I,Value_type>
, I // base , I // base
, VT // value , Value_type // value
, boost::use_default , boost::use_default
, VT // ref , Value_type // ref
> >
{ {
public: public:
typedef boost::iterator_adaptor< typedef boost::iterator_adaptor<
Prevent_deref<I,VT> Prevent_deref<I,Value_type>
, I // base , I // base
, VT // value , Value_type // value
, boost::use_default , boost::use_default
, VT // ref , Value_type // ref
> Base; > Base;
typedef typename Base::reference reference; typedef typename Base::reference reference;
typedef typename std::pair<I, I> range; typedef typename std::pair<I, I> range;
Prevent_deref() : Base() {} Prevent_deref() = default;
Prevent_deref(const I& i) : Base(i) {} Prevent_deref(const I& i) : Base(i) {}
private: private:
friend class boost::iterator_core_access; friend class boost::iterator_core_access;
@ -67,11 +67,6 @@ private:
} }
}; };
template<typename I> template<typename I>
Iterator_range<Prevent_deref<I> > make_prevent_deref_range(const Iterator_range<I>& range) Iterator_range<Prevent_deref<I> > make_prevent_deref_range(const Iterator_range<I>& range)
{ {

6
Triangulation_2/include/CGAL/Regular_triangulation_2.h
View File

@ -182,7 +182,8 @@ public:
operator Vertex_handle() const { return Base::base(); } operator Vertex_handle() const { return Base::base(); }
}; };
typedef Iterator_range<Prevent_deref<Finite_vertices_iterator, Vertex_handle> > Finite_vertex_handles; typedef Iterator_range<Prevent_deref<Finite_vertices_iterator,
Vertex_handle> > Finite_vertex_handles;
class Hidden_vertices_iterator : class Hidden_vertices_iterator :
public Filter_iterator<Finite_vib, Unhidden_tester> public Filter_iterator<Finite_vib, Unhidden_tester>
@ -199,7 +200,8 @@ public:
operator Vertex_handle() const { return Base::base(); } operator Vertex_handle() const { return Base::base(); }
}; };
typedef Iterator_range<Prevent_deref<Hidden_vertices_iterator,Vertex_handle> > Hidden_vertex_handles; typedef Iterator_range<Prevent_deref<Hidden_vertices_iterator,
Vertex_handle> > Hidden_vertex_handles;
//for backward compatibility //for backward compatibility
typedef Finite_faces_iterator Face_iterator; typedef Finite_faces_iterator Face_iterator;

6
Triangulation_2/include/CGAL/Triangulation_2.h
View File

@ -214,8 +214,10 @@ public:
typedef typename Tds::Vertex_handles All_vertex_handles; typedef typename Tds::Vertex_handles All_vertex_handles;
typedef typename Tds::Edges All_edges; typedef typename Tds::Edges All_edges;
typedef Iterator_range<Prevent_deref<Finite_faces_iterator, Face_handle> > Finite_face_handles; typedef Iterator_range<Prevent_deref<Finite_faces_iterator,
typedef Iterator_range<Prevent_deref<Finite_vertices_iterator, Vertex_handle> > Finite_vertex_handles; Face_handle> > Finite_face_handles;
typedef Iterator_range<Prevent_deref<Finite_vertices_iterator,
Vertex_handle> > Finite_vertex_handles;
typedef Iterator_range<Finite_edges_iterator> Finite_edges; typedef Iterator_range<Finite_edges_iterator> Finite_edges;
typedef Iterator_range<Point_iterator> Points; typedef Iterator_range<Point_iterator> Points;

9
Triangulation_3/include/CGAL/Triangulation_3.h
View File

@ -517,8 +517,10 @@ public:
operator Vertex_handle() const { return Base::base(); } operator Vertex_handle() const { return Base::base(); }
}; };
typedef Iterator_range<Prevent_deref<Finite_cells_iterator, Cell_handle> > Finite_cell_handles; typedef Iterator_range<Prevent_deref<Finite_cells_iterator,
typedef Iterator_range<Prevent_deref<Finite_vertices_iterator,Vertex_handle> > Finite_vertex_handles; Cell_handle> > Finite_cell_handles;
typedef Iterator_range<Prevent_deref<Finite_vertices_iterator,
Vertex_handle> > Finite_vertex_handles;
typedef Filter_iterator<Edge_iterator, Infinite_tester> Finite_edges_iterator; typedef Filter_iterator<Edge_iterator, Infinite_tester> Finite_edges_iterator;
typedef Filter_iterator<Facet_iterator, Infinite_tester> Finite_facets_iterator; typedef Filter_iterator<Facet_iterator, Infinite_tester> Finite_facets_iterator;
@ -529,7 +531,8 @@ public:
typedef Triangulation_segment_cell_iterator_3<Self> Segment_cell_iterator; typedef Triangulation_segment_cell_iterator_3<Self> Segment_cell_iterator;
typedef Triangulation_segment_simplex_iterator_3<Self> Segment_simplex_iterator; typedef Triangulation_segment_simplex_iterator_3<Self> Segment_simplex_iterator;
typedef Iterator_range<Prevent_deref<Segment_cell_iterator, Cell_handle> > Segment_traverser_cell_handles; typedef Iterator_range<Prevent_deref<Segment_cell_iterator,
Cell_handle> > Segment_traverser_cell_handles;
typedef Iterator_range<Segment_simplex_iterator> Segment_traverser_simplices; typedef Iterator_range<Segment_simplex_iterator> Segment_traverser_simplices;
private: private: