feedc0de/boost_iterator
1
0
Fork 0
forked from boostorg/iterator
Code Pull Requests Activity

Fix counting_iterator::distance_to fails to instantiate for non default template arguments.

Browse Source 
[SVN r31758]
This commit is contained in:
Thomas Witt
2005-11-23 19:12:49 +00:00
parent 1c3e6c5b65
commit 73811245eb
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/boost/iterator/counting_iterator.hpp
View File

@ -172,7 +172,7 @@ class counting_iterator
# if 0 # if 0
template<class OtherIncrementable> template<class OtherIncrementable>
counting_iterator( counting_iterator(
counting_iterator<OtherIncrementable> const& t counting_iterator<OtherIncrementable, CategoryOrTraversal, Difference> const& t
, typename enable_if_convertible<OtherIncrementable, Incrementable>::type* = 0 , typename enable_if_convertible<OtherIncrementable, Incrementable>::type* = 0
) )
: super_t(t.base()) : super_t(t.base())
@ -188,7 +188,7 @@ class counting_iterator
template <class OtherIncrementable> template <class OtherIncrementable>
difference_type difference_type
distance_to(counting_iterator<OtherIncrementable> const& y) const distance_to(counting_iterator<OtherIncrementable, CategoryOrTraversal, Difference> const& y) const
{ {
typedef typename mpl::if_< typedef typename mpl::if_<
detail::is_numeric<Incrementable> detail::is_numeric<Incrementable>

1
test/counting_iterator_test.cpp
View File

@ -277,6 +277,7 @@ int main()
// Test user-defined type. // Test user-defined type.
test_integer3<my_int1, std::forward_iterator_tag, int>(); test_integer3<my_int1, std::forward_iterator_tag, int>();
test_integer3<long, std::random_access_iterator_tag, int>();
test_integer<my_int2>(); test_integer<my_int2>();
test_integer<my_int3>(); test_integer<my_int3>();