Merge changes from develop for the 1.76.0 release

This commit is contained in:
Marshall Clow
2021-04-07 09:28:02 -07:00
4 changed files with 48 additions and 5 deletions

41
CMakeLists.txt Normal file
View File

@ -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()

View File

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

View File

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

View File

@ -265,7 +265,7 @@
<title>Find Iterator</title> <title>Find Iterator</title>
<para> <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. 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 This facility is using the <link linkend="string_algo.finder_concept">Finder</link> to incrementally
search the string. search the string.