Merge changes from develop for the 1.76.0 release

String Usage doc typo

CMakeLists.txt

@@ -0,0 +1,41 @@
+# Generated by `boostdep --cmake algorithm`
+# Copyright 2020 Peter Dimov
+# Distributed under the Boost Software License, Version 1.0.
+# https://www.boost.org/LICENSE_1_0.txt
+
+cmake_minimum_required(VERSION 3.5...3.16)
+
+project(boost_algorithm VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX)
+
+add_library(boost_algorithm INTERFACE)
+add_library(Boost::algorithm ALIAS boost_algorithm)
+
+target_include_directories(boost_algorithm INTERFACE include)
+
+target_link_libraries(boost_algorithm
+  INTERFACE
+    Boost::array
+    Boost::assert
+    Boost::bind
+    Boost::concept_check
+    Boost::config
+    Boost::core
+    Boost::exception
+    Boost::function
+    Boost::iterator
+    Boost::mpl
+    Boost::range
+    Boost::regex
+    Boost::static_assert
+    Boost::throw_exception
+    Boost::tuple
+    Boost::type_traits
+    Boost::unordered
+)
+
+if(BUILD_TESTING AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt")
+
+  add_subdirectory(test)
+
+endif()
+

doc/Jamfile.v2

@@ -16,18 +16,18 @@ using quickbook ;
 using doxygen ;
 using boostbook ;
 
-doxygen autodoc 
+doxygen autodoc
-    : 
+    :
-        [ glob ../../../boost/algorithm/*.hpp 
+        [ glob ../../../boost/algorithm/*.hpp
                ../../../boost/algorithm/searching/*.hpp
                ../../../boost/algorithm/cxx11/*.hpp
                ../../../boost/algorithm/cxx14/*.hpp
                ../../../boost/algorithm/cxx17/*.hpp
         ]
-    : 
+    :
        <doxygen:param>"PREDEFINED=\"BOOST_ALGORITHM_DOXYGEN=1\""
        <doxygen:param>WARNINGS=YES # Default NO, but useful to see warnings, especially in a logfile.
-    ; 
+    ;
 
 
 xml algorithm : algorithm.qbk ;
@@ -36,7 +36,7 @@ boostbook standalone
   :
     algorithm
   :
-    <dependency>autodoc 
+    <dependency>autodoc
     <xsl:param>boost.root=../../../..
     <xsl:param>"boost.doxygen.reftitle=Boost.Algorithms C++ Reference"
     <xsl:param>chapter.autolabel=0

include/boost/algorithm/apply_permutation.hpp

@@ -19,7 +19,6 @@
 #define BOOST_ALGORITHM_APPLY_PERMUTATION_HPP
 
 #include <algorithm>
-#include <type_traits>
 
 #include <boost/config.hpp>
 #include <boost/range/begin.hpp>

meta/libraries.json

@@ -11,7 +11,8 @@
         ],
         "maintainers": [
             "Marshall Clow <marshall -at- idio.com>"
-        ]
+        ],
+        "cxxstd": "03"
     },
     {
         "key": "algorithm/minmax",
@@ -26,7 +27,8 @@
         ],
         "maintainers": [
             "Marshall Clow <marshall -at- idio.com>"
-        ]
+        ],
+        "cxxstd": "03"
     },
     {
         "key": "algorithm/string",
@@ -42,6 +44,7 @@
         ],
         "maintainers": [
             "Marshall Clow <marshall -at- idio.com>"
-        ]
+        ],
+        "cxxstd": "03"
     }
 ]

string/doc/usage.xml

@@ -265,7 +265,7 @@
         <title>Find Iterator</title>
 
         <para>
-            An extension to find algorithms it the Find Iterator. Instead of searching for just a one part of a string, 
+            An extension to find algorithms is the Find Iterator. Instead of searching for just a one part of a string, 
             the find iterator allows us to iterate over the substrings matching the specified criteria.
             This facility is using the <link linkend="string_algo.finder_concept">Finder</link> to incrementally
             search the string.