Add missing header

Author: igaztanaga

include/boost/container/experimental/segmented_copy.hpp

@@ -21,6 +21,7 @@
 #include <boost/container/detail/config_begin.hpp>
 #include <boost/container/detail/workaround.hpp>
 #include <boost/container/experimental/segmented_iterator_traits.hpp>
+#include <boost/container/detail/iterator.hpp>
 
 namespace boost {
 namespace container {
@@ -68,39 +69,41 @@ OutIter segmented_copy_dispatch
 
 #endif   //BOOST_CONTAINER_SEGMENTED_LOOP_UNROLLING
 
+template <class InIter, class Sent, class OutIter, class Tag, class Cat>
+typename algo_enable_if_c<
+   !Tag::value || is_sentinel<Sent, InIter>::value, OutIter>::type
+   segmented_copy_dispatch(InIter first, Sent last, OutIter result, Tag, Cat)
+{
+   for(; first != last; ++first, ++result)
+      *result = *first;
+   return result;
+}
+
 template <class SegIter, class OutIter, class Cat>
 OutIter segmented_copy_dispatch(SegIter first, SegIter last, OutIter result, segmented_iterator_tag, Cat)
 {
    typedef segmented_iterator_traits<SegIter> traits;
-   typedef typename traits::local_iterator   local_iterator;
-   typedef typename traits::segment_iterator segment_iterator;
+   typedef typename traits::local_iterator    local_iterator;
+   typedef typename traits::segment_iterator  segment_iterator;
+   typedef typename segmented_iterator_traits<local_iterator>::is_segmented_iterator is_local_seg_t;
+   typedef typename iterator_traits<local_iterator>::iterator_category local_cat_t;
 
    segment_iterator sfirst = traits::segment(first);
    segment_iterator slast  = traits::segment(last);
 
    if(sfirst == slast) {
-      return (segmented_copy)(traits::local(first), traits::local(last), result);
+      return (segmented_copy_dispatch)(traits::local(first), traits::local(last), result, is_local_seg_t(), local_cat_t());
    }
    else {
-      result = (segmented_copy)(traits::local(first), traits::end(sfirst), result);
+      result = (segmented_copy_dispatch)(traits::local(first), traits::end(sfirst), result, is_local_seg_t(), local_cat_t());
 
       for(++sfirst; sfirst != slast; ++sfirst)
-         result = (segmented_copy)(traits::begin(sfirst), traits::end(sfirst), result);
+         result = (segmented_copy_dispatch)(traits::begin(sfirst), traits::end(sfirst), result, is_local_seg_t(), local_cat_t());
 
-      return (segmented_copy)(traits::begin(sfirst), traits::local(last), result);
+      return (segmented_copy_dispatch)(traits::begin(sfirst), traits::local(last), result, is_local_seg_t(), local_cat_t());
    }
 }
 
-template <class InIter, class Sent, class OutIter, class Tag, class Cat>
-typename algo_enable_if_c<
-   !Tag::value || is_sentinel<Sent, InIter>::value, OutIter>::type
-   segmented_copy_dispatch(InIter first, Sent last, OutIter result, Tag, Cat)
-{
-   for(; first != last; ++first, ++result)
-      *result = *first;
-   return result;
-}
-
 } // namespace detail_algo
 
 //! Copies elements from [first, last) to the range beginning at \c result.

include/boost/container/experimental/segmented_copy_if.hpp

@@ -21,6 +21,7 @@
 #include <boost/container/detail/config_begin.hpp>
 #include <boost/container/detail/workaround.hpp>
 #include <boost/container/experimental/segmented_iterator_traits.hpp>
+#include <boost/container/detail/iterator.hpp>
 
 namespace boost {
 namespace container {
@@ -90,20 +91,21 @@ OutIter segmented_copy_if_dispatch
    typedef typename traits::local_iterator   local_iterator;
    typedef typename traits::segment_iterator segment_iterator;
    typedef typename segmented_iterator_traits<local_iterator>::is_segmented_iterator is_local_seg_t;
+   typedef typename iterator_traits<local_iterator>::iterator_category local_cat_t;
 
    segment_iterator sfirst = traits::segment(first);
    segment_iterator slast  = traits::segment(last);
 
    if(sfirst == slast) {
-      return (segmented_copy_if_dispatch)(traits::local(first), traits::local(last), result, pred, is_local_seg_t(), Cat());
+      return (segmented_copy_if_dispatch)(traits::local(first), traits::local(last), result, pred, is_local_seg_t(), local_cat_t());
    }
    else {
-      result = (segmented_copy_if_dispatch)(traits::local(first), traits::end(sfirst), result, pred, is_local_seg_t(), Cat());
+      result = (segmented_copy_if_dispatch)(traits::local(first), traits::end(sfirst), result, pred, is_local_seg_t(), local_cat_t());
 
       for(++sfirst; sfirst != slast; ++sfirst)
-         result = (segmented_copy_if_dispatch)(traits::begin(sfirst), traits::end(sfirst), result, pred, is_local_seg_t(), Cat());
+         result = (segmented_copy_if_dispatch)(traits::begin(sfirst), traits::end(sfirst), result, pred, is_local_seg_t(), local_cat_t());
 
-      return (segmented_copy_if_dispatch)(traits::begin(sfirst), traits::local(last), result, pred, is_local_seg_t(), Cat());
+      return (segmented_copy_if_dispatch)(traits::begin(sfirst), traits::local(last), result, pred, is_local_seg_t(), local_cat_t());
    }
 }
 

include/boost/container/experimental/segmented_copy_n.hpp

@@ -21,8 +21,8 @@
 #include <boost/container/detail/config_begin.hpp>
 #include <boost/container/detail/workaround.hpp>
 #include <boost/container/experimental/segmented_iterator_traits.hpp>
-#include <boost/container/detail/iterators.hpp>
 #include <boost/container/detail/std_fwd.hpp>
+#include <boost/container/detail/iterator.hpp>
 
 namespace boost {
 namespace container {