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

[iterators][concatenate_iterator] add one more template parameter for

Browse Source 
the reference type (previously it was defaulted to Value&)
This commit is contained in:
Menelaos Karavelas
2014-09-24 08:42:37 +03:00
parent 49af3c4c87
commit 73ec339f7b
1 changed files with 49 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,13 +23,20 @@ namespace boost { namespace geometry
template <typename Iterator1, typename Iterator2, typename Value>
template
<
typename Iterator1,
typename Iterator2,
typename Value,
typename Reference = Value&
>
class concatenate_iterator
: public boost::iterator_facade
<
concatenate_iterator<Iterator1, Iterator2, Value>,
concatenate_iterator<Iterator1, Iterator2, Value, Reference>,
Value,
boost::bidirectional_traversal_tag
boost::bidirectional_traversal_tag,
Reference
>
{
private:
@@ -54,9 +61,20 @@ public:
: m_it1(end1), m_end1(end1), m_begin2(begin2), m_it2(end2)
{}
template <typename OtherIt1, typename OtherIt2, typename OtherValue>
concatenate_iterator
(concatenate_iterator<OtherIt1, OtherIt2, OtherValue> const& other)
template
<
typename OtherIt1,
typename OtherIt2,
typename OtherValue,
typename OtherReference
>
concatenate_iterator(concatenate_iterator
<
OtherIt1,
OtherIt2,
OtherValue,
OtherReference
> const& other)
: m_it1(other.m_it1)
, m_end1(other.m_end1)
, m_begin2(other.m_begin2)
@@ -71,9 +89,20 @@ public:
(types<OtherIt1, OtherIt2>));
}
template <typename OtherIt1, typename OtherIt2, typename OtherValue>
concatenate_iterator
operator=(concatenate_iterator<OtherIt1, OtherIt2, OtherValue> const& other)
template
<
typename OtherIt1,
typename OtherIt2,
typename OtherValue,
typename OtherReference
>
concatenate_iterator operator=(concatenate_iterator
<
OtherIt1,
OtherIt2,
OtherValue,
OtherReference
> const& other)
{
static const bool are_conv
= boost::is_convertible<OtherIt1, Iterator1>::value
@@ -93,10 +122,10 @@ public:
private:
friend class boost::iterator_core_access;
template <typename It1, typename It2, typename V>
template <typename It1, typename It2, typename V, typename R>
friend class concatenate_iterator;
inline Value& dereference() const
inline Reference dereference() const
{
if ( m_it1 == m_end1 )
{
@@ -105,12 +134,19 @@ private:
return *m_it1;
}
template <typename OtherIt1, typename OtherIt2, typename OtherValue>
template
<
typename OtherIt1,
typename OtherIt2,
typename OtherValue,
typename OtherReference
>
inline bool equal(concatenate_iterator
<
OtherIt1,
OtherIt2,
OtherValue
OtherValue,
OtherReference
> const& other) const
{
return m_it1 == other.m_it1 && m_it2 == other.m_it2;