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

merged from trunk

Browse Source 
[SVN r21894]
This commit is contained in:
Dave Abrahams
2004-01-24 17:49:47 +00:00
parent 1c5454ba96
commit 7f164fea93
3 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/boost/iterator/detail/config_def.hpp
View File

@ -122,4 +122,16 @@
# define BOOST_ARG_DEPENDENT_TYPENAME # define BOOST_ARG_DEPENDENT_TYPENAME
# endif # endif
// no include guard multiple inclusion intended # if BOOST_WORKAROUND(__GNUC__, == 2) && BOOST_WORKAROUND(__GNUC_MINOR__, BOOST_TESTED_AT(95)) \
|| BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
// GCC-2.95 eagerly instantiates templated constructors and conversion
// operators in convertibility checks, causing premature errors.
//
// Borland's problems are harder to diagnose due to lack of an
// instantiation stack backtrace. They may be due in part to the fact
// that it drops cv-qualification willy-nilly in templates.
# define BOOST_NO_ONE_WAY_ITERATOR_INTEROP
# endif
// no include guard; multiple inclusion intended

1
include/boost/iterator/detail/config_undef.hpp
View File

@ -18,6 +18,7 @@
#undef BOOST_NO_STRICT_ITERATOR_INTEROPERABILITY #undef BOOST_NO_STRICT_ITERATOR_INTEROPERABILITY
#undef BOOST_ARG_DEPENDENT_TYPENAME #undef BOOST_ARG_DEPENDENT_TYPENAME
#undef BOOST_NO_LVALUE_RETURN_DETECTION #undef BOOST_NO_LVALUE_RETURN_DETECTION
#undef BOOST_NO_ONE_WAY_ITERATOR_INTEROP
#ifdef BOOST_ITERATOR_CONFIG_DEF #ifdef BOOST_ITERATOR_CONFIG_DEF
# undef BOOST_ITERATOR_CONFIG_DEF # undef BOOST_ITERATOR_CONFIG_DEF

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

@ -228,7 +228,9 @@ namespace boost
template <class I1, class I2> template <class I1, class I2>
struct apply struct apply
: :
# if BOOST_WORKAROUND(BOOST_MSVC, == 1200) # ifdef BOOST_NO_ONE_WAY_ITERATOR_INTEROP
iterator_difference<I1>
# elif BOOST_WORKAROUND(BOOST_MSVC, == 1200)
mpl::if_< mpl::if_<
is_convertible<I2,I1> is_convertible<I2,I1>
, typename I1::difference_type , typename I1::difference_type
@ -573,6 +575,12 @@ namespace boost
// ---------------- // ----------------
// //
# ifdef BOOST_NO_ONE_WAY_ITERATOR_INTEROP
# define BOOST_ITERATOR_CONVERTIBLE(a,b) mpl::true_()
# else
# define BOOST_ITERATOR_CONVERTIBLE(a,b) is_convertible<a,b>()
# endif
# define BOOST_ITERATOR_FACADE_INTEROP(op, result_type, return_prefix, base_op) \ # define BOOST_ITERATOR_FACADE_INTEROP(op, result_type, return_prefix, base_op) \
BOOST_ITERATOR_FACADE_INTEROP_HEAD(inline, op, result_type) \ BOOST_ITERATOR_FACADE_INTEROP_HEAD(inline, op, result_type) \
{ \ { \
@ -582,8 +590,8 @@ namespace boost
)); \ )); \
return_prefix iterator_core_access::base_op( \ return_prefix iterator_core_access::base_op( \
static_cast<Derived1 const&>(lhs) \ static_cast<Derived1 const&>(lhs) \
, static_cast<Derived2 const&>(rhs) \ , static_cast<Derived2 const&>(rhs) \
, is_convertible<Derived2,Derived1>() \ , BOOST_ITERATOR_CONVERTIBLE(Derived2,Derived1) \
); \ ); \
} }