boostorg/iterator
1
0
Fork 1
mirror of https://github.com/boostorg/iterator.git synced 2025-07-21 08:32:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

vc6 workaround and a bugfix

Browse Source 
[SVN r21799]
This commit is contained in:
Dave Abrahams
2004-01-18 16:17:39 +00:00
parent c5dc0fbf0e
commit 2bacc663b1
2 changed files with 40 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
include/boost/iterator/iterator_archetypes.hpp
View File

@ -159,12 +159,15 @@ namespace detail
typename traversal_archetype_impl<TraversalCategory>::template archetype<Derived,Value>
>::type
{
traversal_archetype_() {}
traversal_archetype_(ctor_arg arg)
: mpl::aux::msvc_eti_base<
typename traversal_archetype_impl<TraversalCategory>::template archetype<Derived,Value>
>::type(arg)
{}
typedef typename
traversal_archetype_impl<TraversalCategory>::template archetype<Derived,Value>
base;
traversal_archetype_() {}
traversal_archetype_(ctor_arg arg)
: base(arg)
{}
};
template <>
@ -471,12 +474,25 @@ struct iterator_archetype
iterator_archetype() { }
iterator_archetype(iterator_archetype const& x)
: detail::iterator_archetype_base<Value, AccessCategory, TraversalCategory>(x) { }
: detail::iterator_archetype_base<
Value
, AccessCategory
, TraversalCategory
>(x)
{}
iterator_archetype& operator=(iterator_archetype const&) { return *this; }
iterator_archetype& operator=(iterator_archetype const&)
{ return *this; }
# if 0
// Optional conversion from mutable
// iterator_archetype(iterator_archetype<typename detail::convertible_type<Value>::type, AccessCategory, TraversalCategory> const&);
iterator_archetype(
iterator_archetype<
typename detail::convertible_type<Value>::type
, AccessCategory
, TraversalCategory> const&
);
# endif
};
} // namespace boost

22
include/boost/iterator/iterator_facade.hpp
View File

@ -31,6 +31,10 @@
#include <boost/mpl/always.hpp>
#include <boost/mpl/apply.hpp>
#if BOOST_WORKAROUND(BOOST_MSVC, == 1200)
# include <boost/mpl/if.hpp>
#endif
#include <boost/iterator/detail/config_def.hpp> // this goes last
namespace boost
@ -223,16 +227,20 @@ namespace boost
{
template <class I1, class I2>
struct apply
: mpl::apply_if<
is_convertible<I2,I1>
:
# if BOOST_WORKAROUND(BOOST_MSVC, == 1200)
, typename I1::difference_type
, typename I2::difference_type
mpl::if_<
is_convertible<I2,I1>
, typename I1::difference_type
, typename I2::difference_type
>
# else
, iterator_difference<I1>
, iterator_difference<I2>
mpl::apply_if<
is_convertible<I2,I1>
, iterator_difference<I1>
, iterator_difference<I2>
>
# endif
>
{};
};