[range] merged bug fixes (r81890, refs #5603; r82071, refs #6103) from trunk

[SVN r82139]

include/boost/range/algorithm/search_n.hpp

@@ -20,8 +20,6 @@
 
 namespace boost
 {
-    namespace range
-    {
 
 namespace range_detail
 {
@@ -235,6 +233,8 @@ namespace range_detail
     }
 } // namespace range_detail
 
+namespace range {
+
 /// \brief template function search
 ///
 /// range-based version of the search std algorithm

include/boost/range/detail/any_iterator.hpp

@@ -14,12 +14,14 @@
 #include <boost/mpl/and.hpp>
 #include <boost/mpl/or.hpp>
 #include <boost/mpl/not.hpp>
+#include <boost/iterator/iterator_facade.hpp>
 #include <boost/type_traits/is_const.hpp>
 #include <boost/type_traits/is_reference.hpp>
 #include <boost/type_traits/remove_reference.hpp>
 #include <boost/range/detail/any_iterator_buffer.hpp>
 #include <boost/range/detail/any_iterator_interface.hpp>
 #include <boost/range/detail/any_iterator_wrapper.hpp>
+#include <boost/utility/enable_if.hpp>
 
 namespace boost
 {

include/boost/range/detail/any_iterator_interface.hpp

@@ -11,8 +11,12 @@
 #define BOOST_RANGE_DETAIL_ANY_ITERATOR_INTERFACE_HPP_INCLUDED
 
 #include <boost/range/detail/any_iterator_buffer.hpp>
-#include <boost/type_traits/add_reference.hpp>
+#include <boost/iterator/iterator_categories.hpp>
 #include <boost/type_traits/add_const.hpp>
+#include <boost/type_traits/add_reference.hpp>
+#include <boost/type_traits/is_reference.hpp>
+#include <boost/type_traits/remove_const.hpp>
+#include <boost/type_traits/remove_reference.hpp>
 
 namespace boost
 {

include/boost/range/detail/any_iterator_wrapper.hpp

@@ -10,8 +10,10 @@
 #ifndef BOOST_RANGE_DETAIL_ANY_ITERATOR_WRAPPER_HPP_INCLUDED
 #define BOOST_RANGE_DETAIL_ANY_ITERATOR_WRAPPER_HPP_INCLUDED
 
+#include <boost/cast.hpp>
 #include <boost/range/config.hpp>
 #include <boost/range/detail/any_iterator_interface.hpp>
+#include <boost/range/concepts.hpp>
 
 namespace boost
 {