boost_mirror/iterator
1
0
Fork 0
mirror of https://github.com/boostorg/iterator.git synced 2025-05-10 07:33:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge trunk version (changeset/42064) to release branch

Browse Source 
[SVN r42129]
This commit is contained in:
Boris Gubenko 2007-12-17 18:43:36 +00:00
parent db0e0b7b91
commit 6d0f901b2e
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -433,26 +433,26 @@ namespace boost
# ifdef BOOST_NO_STRICT_ITERATOR_INTEROPERABILITY # ifdef BOOST_NO_STRICT_ITERATOR_INTEROPERABILITY
# define BOOST_ITERATOR_FACADE_INTEROP_HEAD(prefix, op, result_type) \ # define BOOST_ITERATOR_FACADE_INTEROP_HEAD(prefix, op, result_type) \
template < \ template < \
class Derived1, class V1, class TC1, class R1, class D1 \ class Derived1, class V1, class TC1, class Reference1, class Difference1 \
, class Derived2, class V2, class TC2, class R2, class D2 \ , class Derived2, class V2, class TC2, class Reference2, class Difference2 \
> \ > \
prefix typename mpl::apply2<result_type,Derived1,Derived2>::type \ prefix typename mpl::apply2<result_type,Derived1,Derived2>::type \
operator op( \ operator op( \
iterator_facade<Derived1, V1, TC1, R1, D1> const& lhs \ iterator_facade<Derived1, V1, TC1, Reference1, Difference1> const& lhs \
, iterator_facade<Derived2, V2, TC2, R2, D2> const& rhs) , iterator_facade<Derived2, V2, TC2, Reference2, Difference2> const& rhs)
# else # else
# define BOOST_ITERATOR_FACADE_INTEROP_HEAD(prefix, op, result_type) \ # define BOOST_ITERATOR_FACADE_INTEROP_HEAD(prefix, op, result_type) \
template < \ template < \
class Derived1, class V1, class TC1, class R1, class D1 \ class Derived1, class V1, class TC1, class Reference1, class Difference1 \
, class Derived2, class V2, class TC2, class R2, class D2 \ , class Derived2, class V2, class TC2, class Reference2, class Difference2 \
> \ > \
prefix typename boost::detail::enable_if_interoperable< \ prefix typename boost::detail::enable_if_interoperable< \
Derived1, Derived2 \ Derived1, Derived2 \
, typename mpl::apply2<result_type,Derived1,Derived2>::type \ , typename mpl::apply2<result_type,Derived1,Derived2>::type \
>::type \ >::type \
operator op( \ operator op( \
iterator_facade<Derived1, V1, TC1, R1, D1> const& lhs \ iterator_facade<Derived1, V1, TC1, Reference1, Difference1> const& lhs \
, iterator_facade<Derived2, V2, TC2, R2, D2> const& rhs) , iterator_facade<Derived2, V2, TC2, Reference2, Difference2> const& rhs)
# endif # endif
# define BOOST_ITERATOR_FACADE_PLUS_HEAD(prefix,args) \ # define BOOST_ITERATOR_FACADE_PLUS_HEAD(prefix,args) \