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

cleanup in CGAL/Iterator_range.h 

... and add a default constructor to create an
empty range (with singular iterators).
This commit is contained in:
Laurent Rineau 2025-01-22 22:37:21 +01:00
parent 7808c6f93d
commit 9ddc5294fa
1 changed files with 37 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
STL_Extension/include/CGAL/Iterator_range.h
View File

@ -18,56 +18,36 @@
namespace CGAL { namespace CGAL {
/*! /*!
\ingroup PkgSTLExtensionRef \ingroup PkgSTLExtensionRef
/// `CGAL::Iterator_range` is a... `CGAL::Iterator_range` encapsulates two iterators so they fulfill the `ForwardRange` concept.
*/ The class is essentially a clone of <A
template <typename I> href="https://www.boost.org/doc/libs/1_55_0/libs/range/doc/html/range/reference/utilities/iterator_range.html">`boost::iterator_range`</A>,
class Iterator_range and it additionally is derived from `std::pair`, so that one can apply `boost::tie`.
: public std::pair<I,I>{ */
template <typename I>
class Iterator_range : public std::pair<I, I>
{
typedef std::pair<I, I> Base;
typedef std::pair<I,I> Base; public:
typedef I iterator;
typedef I const_iterator;
public: Iterator_range() = default;
Iterator_range(I b, I e)
: Base(b, e) {}
Iterator_range(const std::pair<I, I>& ip)
: Base(ip) {}
typedef I iterator; I begin() const { return this->first; }
typedef I const_iterator; I end() const { return this->second; }
Iterator_range(I b, I e)
: Base(b,e)
{}
// Iterator_range(const Iterator_range& ip)
// : Base(ip)
// {}
Iterator_range(const std::pair<I,I>& ip)
: Base(ip)
{}
I begin() const
{
return this->first;
}
I end() const
{
return this->second;
}
/// returns `std::distance(begin(), end())` /// returns `std::distance(begin(), end())`
std::size_t std::size_t size() const { return static_cast<std::size_t>(std::distance(begin(), end())); }
size() const
{
return static_cast<std::size_t>(std::distance(begin(), end()));
}
/// returns `std::distance(begin(), end())==0` /// returns `std::distance(begin(), end())==0`
bool empty() const bool empty() const { return begin() == end(); }
{
return begin()==end();
}
operator std::tuple<I&, I&>() operator std::tuple<I&, I&>()
{ {
@ -87,37 +67,25 @@ namespace CGAL {
} }
}; };
template <typename T> template <typename T>
Iterator_range<T> Iterator_range<T>
make_range(const T& b, const T&e) make_range(const T& b, const T&e)
{ {
return Iterator_range<T>(b,e); return Iterator_range<T>(b,e);
} }
template <typename T> template <typename T>
Iterator_range<T> Iterator_range<T>
make_range(const std::pair<T,T>& p) make_range(const std::pair<T,T>& p)
{ {
return Iterator_range<T>(p.first,p.second); return Iterator_range<T>(p.first,p.second);
} }
} // namespace CGAL } // namespace CGAL
// At global scope... namespace boost::foreach {
template<typename T> template<typename T>
inline boost::mpl::true_ * struct is_lightweight_proxy<CGAL::Iterator_range<T>> : boost::mpl::true_ {};
boost_foreach_is_lightweight_proxy( CGAL::Iterator_range<T> *&, boost::foreach::tag )
{
return 0;
} }
namespace boost { namespace foreach
{
template<typename T>
struct is_lightweight_proxy< CGAL::Iterator_range<T> >
: mpl::true_
{
};
}}
#endif // CGAL_ITERATOR_RANGE_H #endif // CGAL_ITERATOR_RANGE_H