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

Moved enable_if to boost::iterators from boost::detail to avoid

Browse Source 
conflicting with the definition in the function library.


[SVN r19092]
This commit is contained in:
Dave Abrahams
2003-07-13 01:27:38 +00:00
parent b0aef5a66d
commit f19c1c4059
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/boost/iterator/detail/enable_if.hpp
View File

@ -23,7 +23,7 @@
namespace boost namespace boost
{ {
namespace detail namespace iterators
{ {
// //
// Base machinery for all kinds of enable if // Base machinery for all kinds of enable if
@ -79,7 +79,7 @@ namespace boost
# endif # endif
}; };
} // namespace detail } // namespace iterators
} // namespace boost } // namespace boost

4
include/boost/iterator/filter_iterator.hpp
View File

@ -59,7 +59,7 @@ namespace boost
// don't provide this constructor if UnaryFunction is a // don't provide this constructor if UnaryFunction is a
// function pointer type. Too dangerous. // function pointer type. Too dangerous.
filter_iterator( filter_iterator(
typename detail::enable_if< typename iterators::enable_if<
is_class<Predicate> is_class<Predicate>
, Iterator , Iterator
>::type x >::type x
@ -114,7 +114,7 @@ namespace boost
template <class Predicate, class Iterator> template <class Predicate, class Iterator>
filter_iterator<Predicate,Iterator> filter_iterator<Predicate,Iterator>
make_filter_iterator( make_filter_iterator(
typename detail::enable_if< typename iterators::enable_if<
is_class<Predicate> is_class<Predicate>
, Iterator , Iterator
>::type x >::type x

4
include/boost/iterator/iterator_adaptor.hpp
View File

@ -98,7 +98,7 @@ namespace boost
// of is_convertible in a few cases. // of is_convertible in a few cases.
template<typename From, typename To> template<typename From, typename To>
struct enable_if_convertible struct enable_if_convertible
: detail::enable_if< : iterators::enable_if<
mpl::or_< mpl::or_<
is_same<From,To> is_same<From,To>
, is_convertible<From, To> , is_convertible<From, To>
@ -111,7 +111,7 @@ namespace boost
template<typename From, typename To> template<typename From, typename To>
struct enable_if_convertible struct enable_if_convertible
: detail::enable_if< : iterators::enable_if<
is_convertible<From, To> is_convertible<From, To>
, detail::enable_type , detail::enable_type
> >

4
include/boost/iterator/transform_iterator.hpp
View File

@ -124,7 +124,7 @@ namespace boost
&& BOOST_WORKAROUND(__GNUC_MINOR__, BOOST_TESTED_AT(2)) && BOOST_WORKAROUND(__GNUC_MINOR__, BOOST_TESTED_AT(2))
Iterator const& x Iterator const& x
#else #else
typename detail::enable_if< typename iterators::enable_if<
is_class<UnaryFunction> is_class<UnaryFunction>
, Iterator const& , Iterator const&
>::type x >::type x
@ -163,7 +163,7 @@ namespace boost
// don't provide this generator if UnaryFunction is a // don't provide this generator if UnaryFunction is a
// function pointer type. Too dangerous. We should probably // function pointer type. Too dangerous. We should probably
// find a cheaper test than is_class<> // find a cheaper test than is_class<>
typename detail::enable_if< typename iterators::enable_if<
is_class<UnaryFunction> is_class<UnaryFunction>
, transform_iterator<UnaryFunction, Iterator> , transform_iterator<UnaryFunction, Iterator>
>::type >::type