Implement BOOST_CONTAINER_DISABLE_SEGMENTED_OUTPUT macro

Author: igaztanaga

include/boost/container/experimental/segmented_copy.hpp

@@ -184,13 +184,19 @@ SegDstIter segmented_copy_dst_dispatch
 //////////////////////////////////////////////////////////////////////////////
 
 template <class SrcIter, class Sent, class OutIter, class Tag, class Cat>
+BOOST_CONTAINER_FORCEINLINE 
 typename algo_enable_if_c<
    !Tag::value || is_sentinel<Sent, SrcIter>::value, OutIter>::type
-segmented_copy_dispatch(SrcIter first, Sent last, OutIter result, Tag, Cat)
+   segmented_copy_dispatch(SrcIter first, Sent last, OutIter result, Tag, Cat)
 {
+#if !defined(BOOST_CONTAINER_DISABLE_SEGMENTED_OUTPUT)
    typedef segmented_iterator_traits<OutIter> dst_traits;
    return (segmented_copy_dst_dispatch)
       (first, last, result, typename dst_traits::is_segmented_iterator(), Cat());
+#else
+   return (segmented_copy_dst_dispatch)
+      (first, last, result, non_segmented_iterator_tag(), Cat());
+#endif
 }
 
 template <class SegIter, class OutIter, class Cat>

include/boost/container/experimental/segmented_iterator_traits.hpp

@@ -200,4 +200,16 @@ struct is_sentinel<Iter, Iter>
    // Force no loop unrolling
 #endif
 
+//////////////////////////////////////////////////////////////////////////////
+// BOOST_CONTAINER_DISABLE_SEGMENTED_OUTPUT
+//
+// When defined, segmented algorithms that write to an output iterator will
+// NOT exploit segmentation on the output side.  Only input (source) iterator
+// segmentation is used.  This is useful for benchmarking the advantage of
+// the segmented output optimisation in isolation.
+//
+// Define BOOST_CONTAINER_DISABLE_SEGMENTED_OUTPUT before including any
+// segmented algorithm header to disable the optimisation.
+//////////////////////////////////////////////////////////////////////////////
+
 #endif // BOOST_CONTAINER_EXPERIMENTAL_SEGMENTED_ITERATOR_TRAITS_HPP

include/boost/container/experimental/segmented_remove_copy_if.hpp

@@ -190,14 +190,20 @@ SegDstIter segmented_remove_copy_if_dst_dispatch
 //////////////////////////////////////////////////////////////////////////////
 
 template <bool Move, class SrcIter, class Sent, class OutIter, class Pred, class Tag, class Cat>
+BOOST_CONTAINER_FORCEINLINE 
 typename algo_enable_if_c<
    !Tag::value || is_sentinel<Sent, SrcIter>::value, OutIter>::type
 segmented_remove_copy_if_dispatch
    (SrcIter first, Sent last, OutIter result, Pred pred, Tag, Cat)
 {
+#if !defined(BOOST_CONTAINER_DISABLE_SEGMENTED_OUTPUT)
    typedef segmented_iterator_traits<OutIter> dst_traits;
    return (segmented_remove_copy_if_dst_dispatch<Move>)
       (first, last, result, pred, typename dst_traits::is_segmented_iterator(), Cat());
+#else
+   return (segmented_remove_copy_if_dst_dispatch<Move>)
+      (first, last, result, pred, non_segmented_iterator_tag(), Cat());
+#endif
 }
 
 template <bool Move, class SegIter, class OutIter, class Pred, class Cat>