boost/geometry
2
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2026-02-10 11:32:15 +00:00
Code Issues Projects Releases Wiki Activity

[point iterator][concatenate iterator] replace enable_if mechanism by static assert; add templated assignment operator; make dereference and increment inline;

Browse Source 
templatize equal for comparison against other concatenate iterator (needed for interoperability between const/non-const versions);
This commit is contained in:
Menelaos Karavelas
2014-04-07 11:31:42 +03:00
parent cb3a103256
commit a307bec090
1 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
include/boost/geometry/iterators/concatenate_iterator.hpp
View File

@@ -11,7 +11,6 @@
#define BOOST_GEOMETRY_ITERATORS_CONCATENATE_ITERATOR_HPP
#include <boost/type_traits.hpp>
#include <boost/utility/enable_if.hpp>
#include <boost/iterator.hpp>
#include <boost/iterator/iterator_facade.hpp>
#include <boost/iterator/iterator_categories.hpp>
@@ -35,8 +34,6 @@ private:
Iterator1 m_it1, m_end1;
Iterator2 m_it2;
struct enabler {};
public:
typedef Iterator1 first_iterator_type;
typedef Iterator2 second_iterator_type;
@@ -57,17 +54,27 @@ public:
template <typename OtherIt1, typename OtherIt2, typename OtherValue>
concatenate_iterator
(concatenate_iterator<OtherIt1, OtherIt2, OtherValue> const& other,
typename boost::enable_if_c
<
boost::is_convertible<OtherIt1, Iterator1>::value
&& boost::is_convertible<OtherIt2, Iterator2>::value,
enabler
>::type = enabler())
(concatenate_iterator<OtherIt1, OtherIt2, OtherValue> const& other)
: m_it1(other.m_it1), m_end1(other.m_end1), m_it2(other.m_it2)
{}
{
BOOST_STATIC_ASSERT
( boost::is_convertible<OtherIt1, Iterator1>::value
&& boost::is_convertible<OtherIt2, Iterator2>::value );
}
template <typename OtherIt1, typename OtherIt2, typename OtherValue>
concatenate_iterator
operator=(concatenate_iterator<OtherIt1, OtherIt2, OtherValue> const& other)
{
BOOST_STATIC_ASSERT
( boost::is_convertible<OtherIt1, Iterator1>::value
&& boost::is_convertible<OtherIt2, Iterator2>::value );
m_it1 = other.m_it1;
m_end1 = other.m_end1;
m_it2 = other.m_it2;
return *this;
}
private:
friend class boost::iterator_core_access;
@@ -75,7 +82,7 @@ private:
template <typename It1, typename It2, typename V>
friend class concatenate_iterator;
Value& dereference() const
inline Value& dereference() const
{
if ( m_it1 == m_end1 )
{
@@ -84,12 +91,18 @@ private:
return *m_it1;
}
bool equal(concatenate_iterator const& other) const
template <typename OtherIt1, typename OtherIt2, typename OtherValue>
inline bool equal(concatenate_iterator
<
OtherIt1,
OtherIt2,
OtherValue
> const& other) const
{
return m_it1 == other.m_it1 && m_it2 == other.m_it2;
}
void increment()
inline void increment()
{
if ( m_it1 == m_end1 )
{