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 68261eb0f1
commit 2a41598bd7
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)
{ {

4
TDS_2/include/CGAL/Triangulation_data_structure_2.h
View File

@ -183,7 +183,7 @@ public:
} }
Face_handles face_handles() const { Face_handles face_handles() const {
return { faces_begin(),faces_end() }; return { faces_begin(), faces_end() };
} }
Vertex_iterator vertices_begin() const { Vertex_iterator vertices_begin() const {
@ -195,7 +195,7 @@ public:
} }
Vertex_handles vertex_handles() const { Vertex_handles vertex_handles() const {
return { vertices_begin(),vertices_end() }; return { vertices_begin(), vertices_end() };
} }
Edge_iterator edges_begin() const { Edge_iterator edges_begin() const {

4
TDS_3/include/CGAL/Triangulation_data_structure_3.h
View File

@ -661,7 +661,7 @@ public:
Cell_handles cell_handles() const Cell_handles cell_handles() const
{ {
return {cells_begin(), cells_end()}; return { cells_begin(), cells_end() };
} }
Cell_iterator raw_cells_begin() const Cell_iterator raw_cells_begin() const
@ -720,7 +720,7 @@ public:
Vertex_handles vertex_handles() const Vertex_handles vertex_handles() const
{ {
return {vertices_begin(), vertices_end()}; return { vertices_begin(), vertices_end() };
} }
// CIRCULATOR METHODS // CIRCULATOR METHODS

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

@ -183,7 +183,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>
@ -200,7 +201,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;
@ -2236,7 +2238,7 @@ typename Regular_triangulation_2<Gt,Tds>::Finite_vertex_handles
Regular_triangulation_2<Gt,Tds>:: Regular_triangulation_2<Gt,Tds>::
finite_vertex_handles() const finite_vertex_handles() const
{ {
return { finite_vertices_begin(),finite_vertices_end() }; return { finite_vertices_begin(), finite_vertices_end() };
} }
template < class Gt, class Tds > template < class Gt, class Tds >
@ -2263,7 +2265,7 @@ typename Regular_triangulation_2<Gt,Tds>::Hidden_vertex_handles
Regular_triangulation_2<Gt,Tds>:: Regular_triangulation_2<Gt,Tds>::
hidden_vertex_handles() const hidden_vertex_handles() const
{ {
return { hidden_vertices_begin(),hidden_vertices_end() }; return { hidden_vertices_begin(), hidden_vertices_end() };
} }
template < class Gt, class Tds > template < class Gt, class Tds >

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

@ -213,8 +213,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;
@ -3206,7 +3208,7 @@ typename Triangulation_2<Gt, Tds>::Finite_face_handles
Triangulation_2<Gt, Tds>:: Triangulation_2<Gt, Tds>::
finite_face_handles() const finite_face_handles() const
{ {
return { finite_faces_begin(),finite_faces_end() }; return { finite_faces_begin(), finite_faces_end() };
} }
template <class Gt, class Tds > template <class Gt, class Tds >
@ -3235,7 +3237,7 @@ typename Triangulation_2<Gt, Tds>::Finite_vertex_handles
Triangulation_2<Gt, Tds>:: Triangulation_2<Gt, Tds>::
finite_vertex_handles() const finite_vertex_handles() const
{ {
return { finite_vertices_begin(),finite_vertices_end() }; return { finite_vertices_begin(), finite_vertices_end() };
} }
template <class Gt, class Tds > template <class Gt, class Tds >

13
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:
@ -1833,7 +1836,7 @@ public:
Finite_vertex_handles finite_vertex_handles() const Finite_vertex_handles finite_vertex_handles() const
{ {
return { finite_vertices_begin(), finite_vertices_end()}; return {finite_vertices_begin(), finite_vertices_end()};
} }
Vertex_iterator vertices_begin() const { return _tds.vertices_begin(); } Vertex_iterator vertices_begin() const { return _tds.vertices_begin(); }
@ -2251,7 +2254,7 @@ public:
const Point& pt, const Point& pt,
Cell_handle hint = Cell_handle()) const Cell_handle hint = Cell_handle()) const
{ {
return { segment_traverser_cells_begin(ps, pt, hint), segment_traverser_cells_end()}; return {segment_traverser_cells_begin(ps, pt, hint), segment_traverser_cells_end()};
} }
//// Segment Simplex Iterator //// Segment Simplex Iterator