Merge pull request #151 from grafikrobot/modular

Add support for modular build structure.

build.jam

@@ -0,0 +1,37 @@
+# Copyright René Ferdinand Rivera Morell 2023-2024
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+require-b2 5.2 ;
+
+constant boost_dependencies :
+    /boost/array//boost_array
+    /boost/assert//boost_assert
+    /boost/concept_check//boost_concept_check
+    /boost/config//boost_config
+    /boost/container_hash//boost_container_hash
+    /boost/conversion//boost_conversion
+    /boost/core//boost_core
+    /boost/detail//boost_detail
+    /boost/iterator//boost_iterator
+    /boost/mpl//boost_mpl
+    /boost/optional//boost_optional
+    /boost/preprocessor//boost_preprocessor
+    /boost/regex//boost_regex
+    /boost/static_assert//boost_static_assert
+    /boost/tuple//boost_tuple
+    /boost/type_traits//boost_type_traits
+    /boost/utility//boost_utility ;
+
+project /boost/range
+    ;
+
+explicit
+    [ alias boost_range : : :
+        : <include>include <library>$(boost_dependencies) ]
+    [ alias all : boost_range test ]
+    ;
+
+call-if : boost-library range
+    ;

doc/reference/adaptors/map_values.qbk

@@ -14,7 +14,7 @@
 * [*Precondition:] The `value_type` of the range is an instantiation of `std::pair`.
 * [*Postcondition:] For all elements `x` in the returned range, `x` is the result of `y.second` where `y` is the corresponding element in the original range.
 * [*Range Category:] __single_pass_range__
-* [*Range Return Type:] for constant ranges, `boost::select_second_const<decltype(rng)>` otherwise `boost:select_second_mutable<decltype(rng)>`
+* [*Range Return Type:] for constant ranges, `boost::select_second_const<decltype(rng)>` otherwise `boost::select_second_mutable<decltype(rng)>`
 * [*Returned Range Category:] The range category of `rng`.
 
 [section:map_values_example map_values example]

doc/reference/algorithm_ext/is_sorted.qbk

@@ -19,9 +19,11 @@ bool is_sorted(const SinglePassRange& rng, BinaryPredicate pred);
 
 `is_sorted` determines if a range is sorted.
 For the non-predicate version the return value is `true` if and only if for
-each adjacent elements `[x,y]` the expression `x < y` is `true`.
+each adjacent elements `[x, y]` the expression `y < x` is `false` (i.e.,
+`x <= y`), or if the number of elements is zero or one.
 For the predicate version the return value is `true` is and only if for each
-adjacent elements `[x,y]` the expression `pred(x,y)` is `true`.
+adjacent elements `[x, y]` the expression `pred(y, x)` is `false`, or if the
+number of elements is zero or one.
 
 [heading Definition]
 

include/boost/range/adaptor/strided.hpp

@@ -14,6 +14,7 @@
 #include <boost/range/adaptor/argument_fwd.hpp>
 #include <boost/range/iterator_range.hpp>
 #include <boost/iterator/iterator_facade.hpp>
+#include <boost/iterator/enable_if_convertible.hpp>
 #include <iterator>
 
 namespace boost
@@ -66,7 +67,7 @@ namespace boost
             template<class OtherIterator>
             strided_iterator(
                 const strided_iterator<OtherIterator, Category>& other,
-                typename enable_if_convertible<
+                typename iterators::enable_if_convertible<
                     OtherIterator,
                     base_iterator
                 >::type* = 0
@@ -110,7 +111,7 @@ namespace boost
             template<class OtherIterator>
             bool equal(
                 const strided_iterator<OtherIterator, Category>& other,
-                typename enable_if_convertible<
+                typename iterators::enable_if_convertible<
                     OtherIterator,
                     base_iterator
                 >::type* = 0) const
@@ -177,7 +178,7 @@ namespace boost
                     OtherIterator,
                     bidirectional_traversal_tag
                 >& other,
-                typename enable_if_convertible<
+                typename iterators::enable_if_convertible<
                     OtherIterator,
                     base_iterator
                 >::type* = 0
@@ -239,7 +240,7 @@ namespace boost
                     OtherIterator,
                     bidirectional_traversal_tag
                 >& other,
-                typename enable_if_convertible<
+                typename iterators::enable_if_convertible<
                     OtherIterator,
                     base_iterator
                 >::type* = 0) const
@@ -308,7 +309,7 @@ namespace boost
                     OtherIterator,
                     random_access_traversal_tag
                 >& other,
-                typename enable_if_convertible<
+                typename iterators::enable_if_convertible<
                     OtherIterator,
                     base_iterator
                 >::type* = 0
@@ -372,7 +373,7 @@ namespace boost
                     OtherIterator,
                     random_access_traversal_tag
                 >& other,
-                typename enable_if_convertible<
+                typename iterators::enable_if_convertible<
                             OtherIterator, base_iterator>::type* = 0) const
             {
                 BOOST_ASSERT((other.m_index - m_index) % m_stride == difference_type());
@@ -385,7 +386,7 @@ namespace boost
                     OtherIterator,
                     random_access_traversal_tag
                 >& other,
-                typename enable_if_convertible<
+                typename iterators::enable_if_convertible<
                             OtherIterator, base_iterator>::type* = 0) const
             {
                 return m_index == other.m_index;

include/boost/range/algorithm/for_each.hpp

@@ -13,8 +13,8 @@
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
 #include <boost/range/concepts.hpp>
-#include <boost/utility/enable_if.hpp>
+#include <boost/core/enable_if.hpp>
-#include <boost/ref.hpp>
+#include <boost/core/ref.hpp>
 #include <algorithm>
 
 #if BOOST_WORKAROUND(BOOST_MSVC, == 1600)

include/boost/range/any_range.hpp

@@ -10,6 +10,8 @@
 #define BOOST_RANGE_ANY_RANGE_HPP_INCLUDED
 
 #include <boost/config.hpp>
+#include <boost/mpl/eval_if.hpp>
+#include <boost/mpl/identity.hpp>
 #include <boost/iterator/iterator_categories.hpp>
 #include <boost/iterator/iterator_traits.hpp>
 #include <boost/iterator/iterator_facade.hpp>

include/boost/range/concepts.hpp

@@ -23,7 +23,9 @@
 #include <boost/range/iterator.hpp>
 #include <boost/range/value_type.hpp>
 #include <boost/range/detail/misc_concept.hpp>
+#include <boost/mpl/assert.hpp>
 #include <boost/type_traits/remove_reference.hpp>
+#include <boost/type_traits/is_integral.hpp>
 
 #include <iterator>
 

include/boost/range/detail/any_iterator.hpp

@@ -13,6 +13,7 @@
 #include <boost/mpl/and.hpp>
 #include <boost/mpl/or.hpp>
 #include <boost/mpl/not.hpp>
+#include <boost/mpl/bool.hpp>
 #include <boost/iterator/iterator_facade.hpp>
 #include <boost/type_traits/is_const.hpp>
 #include <boost/type_traits/is_reference.hpp>
@@ -20,7 +21,7 @@
 #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>
+#include <boost/core/enable_if.hpp>
 
 namespace boost
 {

include/boost/range/detail/any_iterator_buffer.hpp

@@ -13,7 +13,7 @@
 #include <boost/array.hpp>
 #include <boost/assert.hpp>
 #include <boost/static_assert.hpp>
-#include <boost/noncopyable.hpp>
+#include <boost/core/noncopyable.hpp>
 
 namespace boost
 {

include/boost/range/detail/any_iterator_interface.hpp

@@ -10,8 +10,10 @@
 #ifndef BOOST_RANGE_DETAIL_ANY_ITERATOR_INTERFACE_HPP_INCLUDED
 #define BOOST_RANGE_DETAIL_ANY_ITERATOR_INTERFACE_HPP_INCLUDED
 
+#include <boost/mpl/if.hpp>
 #include <boost/range/detail/any_iterator_buffer.hpp>
 #include <boost/iterator/iterator_categories.hpp>
+#include <boost/type_traits/add_const.hpp>
 #include <boost/type_traits/is_convertible.hpp>
 #include <boost/type_traits/is_reference.hpp>
 #include <boost/type_traits/remove_const.hpp>

include/boost/range/detail/collection_traits_detail.hpp

@@ -20,10 +20,7 @@
 #include <boost/type_traits/is_convertible.hpp>
 #include <boost/type_traits/remove_pointer.hpp>
 #include <boost/type_traits/remove_cv.hpp>
-#include <boost/mpl/eval_if.hpp>
+#include <boost/mpl/if.hpp>
-#include <boost/mpl/identity.hpp>
-#include <boost/mpl/vector.hpp>
-#include <boost/mpl/fold.hpp>
 
 // Container traits implementation ---------------------------------------------------------
 

include/boost/range/detail/has_member_size.hpp

@@ -13,6 +13,7 @@
 
 #include <boost/type_traits/is_class.hpp>
 #include <boost/type_traits/is_member_function_pointer.hpp>
+#include <boost/mpl/if.hpp>
 #include <boost/mpl/and.hpp>
 #include <boost/mpl/bool.hpp>
 #include <boost/cstdint.hpp>

include/boost/range/detail/join_iterator.hpp

@@ -19,6 +19,7 @@
 
 #include <iterator>
 #include <boost/assert.hpp>
+#include <boost/mpl/if.hpp>
 #include <boost/iterator/iterator_traits.hpp>
 #include <boost/iterator/iterator_facade.hpp>
 #include <boost/range/begin.hpp>

include/boost/range/detail/microsoft.hpp

@@ -56,8 +56,8 @@
 #include <boost/type_traits/is_const.hpp>
 #include <boost/type_traits/is_same.hpp>
 #include <boost/type_traits/remove_cv.hpp>
-#include <boost/utility/addressof.hpp>
+#include <boost/core/addressof.hpp>
-#include <boost/utility/enable_if.hpp> // disable_if
+#include <boost/core/enable_if.hpp> // disable_if
 #include <boost/next_prior.hpp>
 
 #if !defined(BOOST_RANGE_DETAIL_MICROSOFT_RANGE_VERSION_1)

include/boost/range/detail/msvc_has_iterator_workaround.hpp

@@ -20,6 +20,8 @@
 #endif
 
 #if BOOST_WORKAROUND(BOOST_MSVC, <= 1600)
+#include <boost/mpl/bool.hpp>
+
 namespace boost
 {
 namespace cb_details

include/boost/range/has_range_iterator.hpp

@@ -18,7 +18,7 @@
 #include <boost/mpl/has_xxx.hpp>
 #include <boost/range/iterator.hpp>
 #include <boost/type_traits/remove_reference.hpp>
-#include <boost/utility/enable_if.hpp>
+#include <boost/core/enable_if.hpp>
 
 namespace boost
 {

include/boost/range/iterator.hpp

@@ -22,6 +22,7 @@
 #include <boost/type_traits/is_const.hpp>
 #include <boost/type_traits/remove_const.hpp>
 #include <boost/mpl/eval_if.hpp>
+#include <boost/mpl/if.hpp>
 
 namespace boost
 {

include/boost/range/iterator_range_core.hpp

@@ -26,8 +26,11 @@
 #include <boost/iterator/iterator_traits.hpp>
 #include <boost/iterator/iterator_facade.hpp>
 #include <boost/mpl/if.hpp>
+#include <boost/mpl/eval_if.hpp>
 #include <boost/mpl/not.hpp>
+#include <boost/mpl/and.hpp>
 #include <boost/mpl/or.hpp>
+#include <boost/mpl/identity.hpp>
 #include <boost/type_traits/is_abstract.hpp>
 #include <boost/type_traits/is_array.hpp>
 #include <boost/type_traits/is_base_and_derived.hpp>
@@ -41,7 +44,7 @@
 #include <boost/range/has_range_iterator.hpp>
 #include <boost/range/algorithm/equal.hpp>
 #include <boost/range/detail/safe_bool.hpp>
-#include <boost/utility/enable_if.hpp>
+#include <boost/core/enable_if.hpp>
 #include <boost/next_prior.hpp>
 #include <iterator>
 #include <algorithm>

include/boost/range/mfc.hpp

@@ -90,7 +90,7 @@ class CTypedPtrMap;
 #include <boost/iterator/transform_iterator.hpp>
 #include <boost/type_traits/is_const.hpp>
 #include <boost/type_traits/remove_pointer.hpp>
-#include <boost/utility/addressof.hpp>
+#include <boost/core/addressof.hpp>
 #include <afx.h> // legacy CString
 #include <afxcoll.h> // CXXXArray, CXXXList, CMapXXXToXXX
 #include <tchar.h>
@@ -292,11 +292,8 @@ namespace boost { namespace range_detail_microsoft {
         struct meta
         {
             typedef list_iterator<X, ::CObject *> mutable_iterator;
-    #if !defined(BOOST_RANGE_MFC_CONST_COL_RETURNS_NON_REF)
+            // const CObList and const CPtrList both return a value (and probably always will)
-            typedef list_iterator<X const, ::CObject const *> const_iterator;
-    #else
             typedef list_iterator<X const, ::CObject const * const, ::CObject const * const> const_iterator;
-    #endif
         };
     };
 
@@ -309,11 +306,8 @@ namespace boost { namespace range_detail_microsoft {
         struct meta
         {
             typedef list_iterator<X, void *> mutable_iterator;
-    #if !defined(BOOST_RANGE_MFC_CONST_COL_RETURNS_NON_REF)
+            // const CObList and const CPtrList both return a value (and probably always will)
-            typedef list_iterator<X const, void const *> const_iterator;
-    #else
             typedef list_iterator<X const, void const * const, void const * const> const_iterator;
-    #endif
         };
     };
 

include/boost/range/size_type.hpp

@@ -20,7 +20,7 @@
 #include <boost/range/concepts.hpp>
 #include <boost/range/has_range_iterator.hpp>
 
-#include <boost/utility/enable_if.hpp>
+#include <boost/core/enable_if.hpp>
 #include <boost/type_traits/make_unsigned.hpp>
 #include <boost/type_traits/remove_const.hpp>
 #include <cstddef>

include/boost/range/sub_range.hpp

@@ -27,6 +27,8 @@
 #include <boost/range/reference.hpp>
 #include <boost/range/algorithm/equal.hpp>
 #include <boost/assert.hpp>
+#include <boost/mpl/eval_if.hpp>
+#include <boost/mpl/identity.hpp>
 #include <boost/type_traits/is_reference.hpp>
 #include <boost/type_traits/remove_reference.hpp>
 

test/Jamfile.v2

@@ -14,19 +14,23 @@ import testing ;
 
 project
     : requirements
-        <library>/boost/test//boost_unit_test_framework/
+        <library>/boost/assign//boost_assign
-        <library>/boost/regex//boost_regex/
+        <library>/boost/foreach//boost_foreach
+        <library>/boost/lambda//boost_lambda
+        <library>/boost/regex//boost_regex/<link>static
+        <library>/boost/test//boost_unit_test_framework
+        <library>/boost/variant//boost_variant
         <link>static
         <threading>multi
     ;
 
-rule range-test ( name : includes * )
+rule range-test ( name : requirements * )
 {
     return [
-        run $(name).cpp /boost/test//boost_unit_test_framework /boost/regex//boost_regex/<link>static
+        run $(name).cpp
         :
         :
-        : <toolset>gcc:<cxxflags>"-Wall -Wunused "
+        : <toolset>gcc:<cxxflags>"-Wall -Wunused " $(requirements)
         ] ;
 }
 
@@ -67,7 +71,7 @@ test-suite range :
     [ range-test adaptor_test/sliced ]
     [ range-test adaptor_test/strided ]
     [ range-test adaptor_test/strided2 ]
-    [ range-test adaptor_test/ticket_6742_transformed_c4789_warning ]
+    [ range-test adaptor_test/ticket_6742_transformed_c4789_warning : <library>/boost/phoenix//boost_phoenix ]
     [ range-test adaptor_test/ticket_8676_sliced_transformed ]
     [ range-test adaptor_test/ticket_9519_strided_reversed ]
     [ range-test adaptor_test/tokenized ]