feedc0de/boost_range
1
0
Fork 0
forked from boostorg/range
Code Pull Requests Activity

hotfix to regression in integer_range due to recent SFINAE change to iterator_range.

Browse Source
This commit is contained in:
Neil Groves
2014-02-26 00:56:27 +00:00
parent 654ae838ee
commit 9e6bdc13ba
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/boost/range/irange.hpp
View File

@ -51,6 +51,7 @@ namespace boost
typedef typename base_t::value_type value_type; typedef typename base_t::value_type value_type;
typedef typename base_t::difference_type difference_type; typedef typename base_t::difference_type difference_type;
typedef typename base_t::reference reference; typedef typename base_t::reference reference;
typedef std::random_access_iterator_tag iterator_category;
integer_iterator() : m_value() {} integer_iterator() : m_value() {}
explicit integer_iterator(value_type x) : m_value(x) {} explicit integer_iterator(value_type x) : m_value(x) {}
@ -73,7 +74,11 @@ namespace boost
difference_type distance_to(const integer_iterator& other) const difference_type distance_to(const integer_iterator& other) const
{ {
return other.m_value - m_value; return is_signed<value_type>::value
? (other.m_value - m_value)
: (other.m_value >= m_value)
? static_cast<difference_type>(other.m_value - m_value)
: -static_cast<difference_type>(m_value - other.m_value);
} }
bool equal(const integer_iterator& other) const bool equal(const integer_iterator& other) const
@ -123,6 +128,7 @@ namespace boost
typedef typename base_t::value_type value_type; typedef typename base_t::value_type value_type;
typedef typename base_t::difference_type difference_type; typedef typename base_t::difference_type difference_type;
typedef typename base_t::reference reference; typedef typename base_t::reference reference;
typedef std::random_access_iterator_tag iterator_category;
integer_iterator_with_step(value_type first, difference_type step, value_type step_size) integer_iterator_with_step(value_type first, difference_type step, value_type step_size)
: m_first(first) : m_first(first)
@ -164,7 +170,7 @@ namespace boost
friend class ::boost::iterator_core_access; friend class ::boost::iterator_core_access;
value_type m_first; value_type m_first;
value_type m_step; difference_type m_step;
difference_type m_step_size; difference_type m_step_size;
}; };