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

Make Surface Mesh Index_iterator random access

This commit is contained in:
Simon Giraudot 2018-04-09 16:34:56 +02:00
parent efca373e30
commit b894992e8d
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Surface_mesh/include/CGAL/Surface_mesh/Surface_mesh.h
View File

@ -123,9 +123,7 @@ namespace CGAL {
/// decrement. /// decrement.
SM_Index operator--(int) { SM_Index tmp(*this); --idx_; return tmp; } SM_Index operator--(int) { SM_Index tmp(*this); --idx_; return tmp; }
SM_Index operator+=(std::ptrdiff_t n) { idx_ += n; return *this; }
private: private:
size_type idx_; size_type idx_;
@ -463,12 +461,12 @@ private: //------------------------------------------------------ iterator types
class Index_iterator class Index_iterator
: public boost::iterator_facade< Index_iterator<Index_>, : public boost::iterator_facade< Index_iterator<Index_>,
Index_, Index_,
std::bidirectional_iterator_tag std::random_access_iterator_tag
> >
{ {
typedef boost::iterator_facade< Index_iterator<Index_>, typedef boost::iterator_facade< Index_iterator<Index_>,
Index_, Index_,
std::bidirectional_iterator_tag std::random_access_iterator_tag
> Facade; > Facade;
public: public:
Index_iterator() : hnd_(), mesh_(NULL) {} Index_iterator() : hnd_(), mesh_(NULL) {}
@ -497,6 +495,18 @@ private: //------------------------------------------------------ iterator types
while ( mesh_->has_valid_index(hnd_) && mesh_->is_removed(hnd_)) --hnd_; while ( mesh_->has_valid_index(hnd_) && mesh_->is_removed(hnd_)) --hnd_;
} }
void advance(std::ptrdiff_t n)
{
CGAL_assertion(mesh_ != NULL);
CGAL_assertion(!(mesh_->has_garbage()));
hnd_ += n;
}
std::ptrdiff_t distance_to(const Index_iterator& other) const
{
return std::ptrdiff_t(other.hnd_) - std::ptrdiff_t(this->hnd_);
}
bool equal(const Index_iterator& other) const bool equal(const Index_iterator& other) const
{ {
return this->hnd_ == other.hnd_; return this->hnd_ == other.hnd_;