From f19c1c40595c9c0bf679e850cc8fea9aa8508f25 Mon Sep 17 00:00:00 2001 From: Dave Abrahams Date: Sun, 13 Jul 2003 01:27:38 +0000 Subject: [PATCH] Moved enable_if to boost::iterators from boost::detail to avoid conflicting with the definition in the function library. [SVN r19092] --- include/boost/iterator/detail/enable_if.hpp | 4 ++-- include/boost/iterator/filter_iterator.hpp | 4 ++-- include/boost/iterator/iterator_adaptor.hpp | 4 ++-- include/boost/iterator/transform_iterator.hpp | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/boost/iterator/detail/enable_if.hpp b/include/boost/iterator/detail/enable_if.hpp index d939fbb..f0a7bc7 100644 --- a/include/boost/iterator/detail/enable_if.hpp +++ b/include/boost/iterator/detail/enable_if.hpp @@ -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 diff --git a/include/boost/iterator/filter_iterator.hpp b/include/boost/iterator/filter_iterator.hpp index 547513f..5b16bb1 100644 --- a/include/boost/iterator/filter_iterator.hpp +++ b/include/boost/iterator/filter_iterator.hpp @@ -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 , Iterator >::type x @@ -114,7 +114,7 @@ namespace boost template filter_iterator make_filter_iterator( - typename detail::enable_if< + typename iterators::enable_if< is_class , Iterator >::type x diff --git a/include/boost/iterator/iterator_adaptor.hpp b/include/boost/iterator/iterator_adaptor.hpp index d9a6263..faecc1a 100644 --- a/include/boost/iterator/iterator_adaptor.hpp +++ b/include/boost/iterator/iterator_adaptor.hpp @@ -98,7 +98,7 @@ namespace boost // of is_convertible in a few cases. template struct enable_if_convertible - : detail::enable_if< + : iterators::enable_if< mpl::or_< is_same , is_convertible @@ -111,7 +111,7 @@ namespace boost template struct enable_if_convertible - : detail::enable_if< + : iterators::enable_if< is_convertible , detail::enable_type > diff --git a/include/boost/iterator/transform_iterator.hpp b/include/boost/iterator/transform_iterator.hpp index f560116..e0ab3dd 100644 --- a/include/boost/iterator/transform_iterator.hpp +++ b/include/boost/iterator/transform_iterator.hpp @@ -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 , 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 , transform_iterator >::type