mirror of
https://github.com/boostorg/iterator.git
synced 2025-07-21 08:32:08 +02:00
Moved enable_if to boost::iterators from boost::detail to avoid
conflicting with the definition in the function library. [SVN r19092]
This commit is contained in:
@ -23,7 +23,7 @@
|
||||
namespace boost
|
||||
{
|
||||
|
||||
namespace detail
|
||||
namespace iterators
|
||||
{
|
||||
//
|
||||
// Base machinery for all kinds of enable if
|
||||
@ -79,7 +79,7 @@ namespace boost
|
||||
# endif
|
||||
};
|
||||
|
||||
} // namespace detail
|
||||
} // namespace iterators
|
||||
|
||||
} // namespace boost
|
||||
|
||||
|
@ -59,7 +59,7 @@ namespace boost
|
||||
// don't provide this constructor if UnaryFunction is a
|
||||
// function pointer type. Too dangerous.
|
||||
filter_iterator(
|
||||
typename detail::enable_if<
|
||||
typename iterators::enable_if<
|
||||
is_class<Predicate>
|
||||
, Iterator
|
||||
>::type x
|
||||
@ -114,7 +114,7 @@ namespace boost
|
||||
template <class Predicate, class Iterator>
|
||||
filter_iterator<Predicate,Iterator>
|
||||
make_filter_iterator(
|
||||
typename detail::enable_if<
|
||||
typename iterators::enable_if<
|
||||
is_class<Predicate>
|
||||
, Iterator
|
||||
>::type x
|
||||
|
@ -98,7 +98,7 @@ namespace boost
|
||||
// of is_convertible in a few cases.
|
||||
template<typename From, typename To>
|
||||
struct enable_if_convertible
|
||||
: detail::enable_if<
|
||||
: iterators::enable_if<
|
||||
mpl::or_<
|
||||
is_same<From,To>
|
||||
, is_convertible<From, To>
|
||||
@ -111,7 +111,7 @@ namespace boost
|
||||
|
||||
template<typename From, typename To>
|
||||
struct enable_if_convertible
|
||||
: detail::enable_if<
|
||||
: iterators::enable_if<
|
||||
is_convertible<From, To>
|
||||
, detail::enable_type
|
||||
>
|
||||
|
@ -124,7 +124,7 @@ namespace boost
|
||||
&& BOOST_WORKAROUND(__GNUC_MINOR__, BOOST_TESTED_AT(2))
|
||||
Iterator const& x
|
||||
#else
|
||||
typename detail::enable_if<
|
||||
typename iterators::enable_if<
|
||||
is_class<UnaryFunction>
|
||||
, Iterator const&
|
||||
>::type x
|
||||
@ -163,7 +163,7 @@ namespace boost
|
||||
// don't provide this generator if UnaryFunction is a
|
||||
// function pointer type. Too dangerous. We should probably
|
||||
// find a cheaper test than is_class<>
|
||||
typename detail::enable_if<
|
||||
typename iterators::enable_if<
|
||||
is_class<UnaryFunction>
|
||||
, transform_iterator<UnaryFunction, Iterator>
|
||||
>::type
|
||||
|
Reference in New Issue
Block a user