Compare commits

...

2 Commits

Author SHA1 Message Date
nobody
856c5914d7 This commit was manufactured by cvs2svn to create tag
'Version_1_33_1'.

[SVN r31916]
2005-12-05 14:04:06 +00:00
Thomas Witt
11230a7af1 Fix counting_iterator::distance_to fails to instantiate for non default template arguments.
[SVN r31779]
2005-11-25 22:16:09 +00:00
2 changed files with 3 additions and 2 deletions

View File

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

View File

@@ -277,6 +277,7 @@ int main()
// Test user-defined type.
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_int3>();