From c6f784cb7034b0a8c3183086fcd7ed8389e50a03 Mon Sep 17 00:00:00 2001 From: Ben10do Date: Wed, 1 Aug 2018 20:54:17 +0100 Subject: [PATCH 01/63] Use forwarding references in string/split.hpp On compilers that support C++11, this allows both lvalues and rvalues to be used as inputs to the split(), find_all(), and ifind_all() functions. For example, given a function get_string() that returns a std::string, this allows you to write: boost::split(result, get_string(), boost::is_any_of(" ")) --- include/boost/algorithm/string/iter_find.hpp | 8 ++++++++ include/boost/algorithm/string/split.hpp | 12 ++++++++++++ 2 files changed, 20 insertions(+) diff --git a/include/boost/algorithm/string/iter_find.hpp b/include/boost/algorithm/string/iter_find.hpp index 10424abc7..d76a81989 100644 --- a/include/boost/algorithm/string/iter_find.hpp +++ b/include/boost/algorithm/string/iter_find.hpp @@ -71,7 +71,11 @@ namespace boost { inline SequenceSequenceT& iter_find( SequenceSequenceT& Result, +#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) + RangeT&& Input, +#else RangeT& Input, +#endif FinderT Finder ) { BOOST_CONCEPT_ASSERT(( @@ -142,7 +146,11 @@ namespace boost { inline SequenceSequenceT& iter_split( SequenceSequenceT& Result, +#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) + RangeT&& Input, +#else RangeT& Input, +#endif FinderT Finder ) { BOOST_CONCEPT_ASSERT(( diff --git a/include/boost/algorithm/string/split.hpp b/include/boost/algorithm/string/split.hpp index cae712c07..e0b30fb35 100644 --- a/include/boost/algorithm/string/split.hpp +++ b/include/boost/algorithm/string/split.hpp @@ -61,7 +61,11 @@ namespace boost { template< typename SequenceSequenceT, typename Range1T, typename Range2T > inline SequenceSequenceT& find_all( SequenceSequenceT& Result, +#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) + Range1T&& Input, +#else Range1T& Input, +#endif const Range2T& Search) { return ::boost::algorithm::iter_find( @@ -96,7 +100,11 @@ namespace boost { template< typename SequenceSequenceT, typename Range1T, typename Range2T > inline SequenceSequenceT& ifind_all( SequenceSequenceT& Result, +#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) + Range1T&& Input, +#else Range1T& Input, +#endif const Range2T& Search, const std::locale& Loc=std::locale() ) { @@ -139,7 +147,11 @@ namespace boost { template< typename SequenceSequenceT, typename RangeT, typename PredicateT > inline SequenceSequenceT& split( SequenceSequenceT& Result, +#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) + RangeT&& Input, +#else RangeT& Input, +#endif PredicateT Pred, token_compress_mode_type eCompress=token_compress_off ) { From 5408a17020ba7d7467288ce59f820a07ae890142 Mon Sep 17 00:00:00 2001 From: Ben10do Date: Wed, 1 Aug 2018 22:42:18 +0100 Subject: [PATCH 02/63] Add tests with lvalue inputs If the compiler supports forwarding references, we now test if lvalues can be used as input strings for split(), find_all(), and ifind_all(). Note that MSVC (without its recent /permissive- flag) may pass these tests without the forwarding references changes that I made, due to its non-standard binding of lvalues to rvalues. --- string/test/split_test.cpp | 39 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/string/test/split_test.cpp b/string/test/split_test.cpp index 582472b8b..d7e9186d7 100644 --- a/string/test/split_test.cpp +++ b/string/test/split_test.cpp @@ -7,6 +7,8 @@ // See http://www.boost.org for updates, documentation, and revision history. +#include + #include #include // equals predicate is used for result comparison @@ -82,6 +84,28 @@ void iterator_test() string("xx") ); deep_compare( tokens, vtokens ); +#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) + // If using a compiler that supports forwarding references, we should be able to use lvalues, too + find_all( + tokens, + string("xx-abc--xx-abb"), + "xx" ); + + BOOST_REQUIRE( tokens.size()==2 ); + BOOST_CHECK( tokens[0]==string("xx") ); + BOOST_CHECK( tokens[1]==string("xx") ); + + ifind_all( + tokens, + string("Xx-abc--xX-abb-xx"), + "xx" ); + + BOOST_REQUIRE( tokens.size()==3 ); + BOOST_CHECK( tokens[0]==string("Xx") ); + BOOST_CHECK( tokens[1]==string("xX") ); + BOOST_CHECK( tokens[2]==string("xx") ); +#endif + // split tests split( tokens, @@ -144,6 +168,21 @@ void iterator_test() BOOST_REQUIRE( tokens.size()==1 ); BOOST_CHECK( tokens[0]==string("") ); +#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) + // If using a compiler that supports forwarding references, we should be able to use lvalues, too + split( + tokens, + string("Xx-abc--xX-abb-xx"), + is_any_of("xX"), + token_compress_on ); + + BOOST_REQUIRE( tokens.size()==4 ); + BOOST_CHECK( tokens[0]==string("") ); + BOOST_CHECK( tokens[1]==string("-abc--") ); + BOOST_CHECK( tokens[2]==string("-abb-") ); + BOOST_CHECK( tokens[3]==string("") ); +#endif + find_iterator fiter=make_find_iterator(str1, first_finder("xx")); find_iterator fiter2; From 45baad2431913db14ff0d2d014226985bf3602ae Mon Sep 17 00:00:00 2001 From: Ben10do Date: Thu, 2 Aug 2018 22:18:54 +0100 Subject: [PATCH 03/63] Correct lvalue/rvalue nomenclature MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I accidentally referred to the additional tests as using lvalues as inputs, when they’re actually using rvalues. This commit corrects the relevant comments. --- string/test/split_test.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/string/test/split_test.cpp b/string/test/split_test.cpp index d7e9186d7..3dbcfac22 100644 --- a/string/test/split_test.cpp +++ b/string/test/split_test.cpp @@ -85,7 +85,7 @@ void iterator_test() deep_compare( tokens, vtokens ); #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) - // If using a compiler that supports forwarding references, we should be able to use lvalues, too + // If using a compiler that supports forwarding references, we should be able to use rvalues, too find_all( tokens, string("xx-abc--xx-abb"), @@ -169,7 +169,7 @@ void iterator_test() BOOST_CHECK( tokens[0]==string("") ); #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) - // If using a compiler that supports forwarding references, we should be able to use lvalues, too + // If using a compiler that supports forwarding references, we should be able to use rvalues, too split( tokens, string("Xx-abc--xX-abb-xx"), From f39107f2289a61ee151387c424d5dd577f5aface Mon Sep 17 00:00:00 2001 From: Tinko Bartels Date: Tue, 23 Apr 2019 13:48:19 +0200 Subject: [PATCH 04/63] Replace broken links. --- include/boost/algorithm/find_backward.hpp | 2 +- include/boost/algorithm/find_not.hpp | 2 +- minmax/doc/minmax_synopsis.html | 38 +++++++++++------------ minmax/index.html | 32 +++++++++---------- string/doc/external_concepts.html | 2 +- 5 files changed, 38 insertions(+), 38 deletions(-) diff --git a/include/boost/algorithm/find_backward.hpp b/include/boost/algorithm/find_backward.hpp index 66901a147..6102c9ab2 100644 --- a/include/boost/algorithm/find_backward.hpp +++ b/include/boost/algorithm/find_backward.hpp @@ -2,7 +2,7 @@ Copyright (c) T. Zachary Laine 2018. Distributed under the Boost Software License, Version 1.0. (See accompanying - file LICENSE10.txt or copy at http://www.boost.org/LICENSE10.txt) + file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ #ifndef BOOST_ALGORITHM_FIND_BACKWARD_HPP #define BOOST_ALGORITHM_FIND_BACKWARD_HPP diff --git a/include/boost/algorithm/find_not.hpp b/include/boost/algorithm/find_not.hpp index ef4df00b8..4d8a28abf 100644 --- a/include/boost/algorithm/find_not.hpp +++ b/include/boost/algorithm/find_not.hpp @@ -2,7 +2,7 @@ Copyright (c) T. Zachary Laine 2018. Distributed under the Boost Software License, Version 1.0. (See accompanying - file LICENSE10.txt or copy at http://www.boost.org/LICENSE10.txt) + file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ #ifndef BOOST_ALGORITHM_FIND_NOT_HPP #define BOOST_ALGORITHM_FIND_NOT_HPP diff --git a/minmax/doc/minmax_synopsis.html b/minmax/doc/minmax_synopsis.html index 1651a13f1..09b64f80e 100644 --- a/minmax/doc/minmax_synopsis.html +++ b/minmax/doc/minmax_synopsis.html @@ -24,7 +24,7 @@

tuple<T const&, T const&> > minmax(const T& a, const T& b); - template <class T, class BinaryPredicate> + template <class T, class BinaryPredicate> tuple<T const&, T const&> > minmax(const T& a, const T& b, BinaryPredicate comp); @@ -38,77 +38,77 @@

namespace boost { - template <class ForwardIterator> + template <class ForwardIterator> std::pair<ForwardIterator,ForwardIterator> minmax_element(ForwardIterator first, ForwardIterator last); - template <class ForwardIterator, class BinaryPredicate> + template <class ForwardIterator, class BinaryPredicate> std::pair<ForwardIterator,ForwardIterator> minmax_element(ForwardIterator first, ForwardIterator last, BinaryPredicate comp); // Variants - template <class ForwardIterator> + template <class ForwardIterator> ForwardIterator first_min_element(ForwardIterator first, ForwardIterator last); - template <class ForwardIterator, class BinaryPredicate> + template <class ForwardIterator, class BinaryPredicate> ForwardIterator first_min_element(ForwardIterator first, ForwardIterator last, BinaryPredicate comp); - template <class ForwardIterator> + template <class ForwardIterator> ForwardIterator last_min_element(ForwardIterator first, ForwardIterator last); - template <class ForwardIterator, class BinaryPredicate> + template <class ForwardIterator, class BinaryPredicate> ForwardIterator last_min_element(ForwardIterator first, ForwardIterator last, BinaryPredicate comp); - template <class ForwardIterator> + template <class ForwardIterator> ForwardIterator first_max_element(ForwardIterator first, ForwardIterator last); - template <class ForwardIterator, class BinaryPredicate> + template <class ForwardIterator, class BinaryPredicate> ForwardIterator first_max_element(ForwardIterator first, ForwardIterator last, BinaryPredicate comp); - template <class ForwardIterator> + template <class ForwardIterator> ForwardIterator last_max_element(ForwardIterator first, ForwardIterator last); - template <class ForwardIterator, class BinaryPredicate> + template <class ForwardIterator, class BinaryPredicate> ForwardIterator last_max_element(ForwardIterator first, ForwardIterator last, BinaryPredicate comp); - template <class ForwardIterator> + template <class ForwardIterator> std::pair<ForwardIterator,ForwardIterator> first_min_first_max_element(ForwardIterator first, ForwardIterator last); - template <class ForwardIterator, class BinaryPredicate> + template <class ForwardIterator, class BinaryPredicate> std::pair<ForwardIterator,ForwardIterator> first_min_first_max_element(ForwardIterator first, ForwardIterator last, BinaryPredicate comp); - template <class ForwardIterator> + template <class ForwardIterator> std::pair<ForwardIterator,ForwardIterator> first_min_last_max_element(ForwardIterator first, ForwardIterator last); - template <class ForwardIterator, class BinaryPredicate> + template <class ForwardIterator, class BinaryPredicate> std::pair<ForwardIterator,ForwardIterator> first_min_last_max_element(ForwardIterator first, ForwardIterator last, BinaryPredicate comp); - template <class ForwardIterator> + template <class ForwardIterator> std::pair<ForwardIterator,ForwardIterator> last_min_first_max_element(ForwardIterator first, ForwardIterator last); - template <class ForwardIterator, class BinaryPredicate> + template <class ForwardIterator, class BinaryPredicate> std::pair<ForwardIterator,ForwardIterator> last_min_first_max_element(ForwardIterator first, ForwardIterator last, BinaryPredicate comp); - template <class ForwardIterator> + template <class ForwardIterator> std::pair<ForwardIterator,ForwardIterator> last_min_last_max_element(ForwardIterator first, ForwardIterator last); - template <class ForwardIterator, class BinaryPredicate> + template <class ForwardIterator, class BinaryPredicate> std::pair<ForwardIterator,ForwardIterator> last_min_last_max_element(ForwardIterator first, ForwardIterator last, BinaryPredicate comp); diff --git a/minmax/index.html b/minmax/index.html index 72a511631..f58bfe659 100644 --- a/minmax/index.html +++ b/minmax/index.html @@ -95,7 +95,7 @@

tuple<T const&, T const&> minmax(const T& a, const T& b); - template <class T, class BinaryPredicate> + template <class T, class BinaryPredicate> tuple<T const&, T const&> minmax(const T& a, const T& b, BinaryPredicate comp); @@ -109,11 +109,11 @@

namespace boost { - template <class ForwardIterator> + template <class ForwardIterator> std::pair<ForwardIterator,ForwardIterator> minmax_element(ForwardIterator first, ForwardIterator last); - template <class ForwardIterator, class BinaryPredicate> + template <class ForwardIterator, class BinaryPredicate> std::pair<ForwardIterator,ForwardIterator> minmax_element(ForwardIterator first, ForwardIterator last, BinaryPredicate comp); @@ -190,26 +190,26 @@

Requirements on types

-For minmax, T must be a model of LessThan +For minmax, T must be a model of LessThan Comparable.

For all the other function templates, versions with two template parameters:

For the versions with three template parameters:
  • -ForwardIterator is a model of Forward +ForwardIterator is a model of Forward Iterator.
  • -BinaryPredicate is a model of Binary +BinaryPredicate is a model of Binary Predicate.
  • @@ -285,8 +285,8 @@

    assert( result1.get<0>() == 0 ); assert( result1.get<1>() == 1 ); - list<int> L; - generate_n(front_inserter(L), 1000, rand); + list<int> L; + generate_n(front_inserter(L), 1000, rand); typedef list<int>::const_iterator iterator; pair< iterator, iterator > result2 = boost::minmax_element(L.begin(), L.end()); @@ -512,13 +512,13 @@

    All my thanks for the excellent advice and reviews from all.

    See also

    -min, max, -min_element, -max_element, -LessThan +min, max, +min_element, +max_element, +LessThan Comparable, -sort, -nth_element +sort, +nth_element .

    Last modified 2012-12-10 diff --git a/string/doc/external_concepts.html b/string/doc/external_concepts.html index af403bebb..679573fbc 100644 --- a/string/doc/external_concepts.html +++ b/string/doc/external_concepts.html @@ -31,7 +31,7 @@ typedef implementation defined foo_type;

    The corresponding external concept is the ExternalFooConcept.

    A type T fullfills the ExternalFooConcept if these free-standing functions and type-generators exists:

    void foo( const T&, int );
    int bar( T& );
    - foo_type_of< T >::type;

    Literature

    © Thorsten Ottosen 2003-2004 (nesotto_AT_cs.auc.dk). + foo_type_of< T >::type;

    Literature

    © Thorsten Ottosen 2003-2004 (nesotto_AT_cs.auc.dk).
    Use, modification and distribution is subject to 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) From ac1713e130c10d914a811500768a1c819cd29c47 Mon Sep 17 00:00:00 2001 From: "James E. King III" Date: Tue, 30 Oct 2018 15:41:36 +0000 Subject: [PATCH 05/63] Enhance CI, add license and readme, and fix a visibility issue --- .travis.yml | 318 ++++++++++-------- Jamfile | 11 + LICENSE | 23 ++ README.md | 35 ++ appveyor.yml | 183 ++++++---- include/boost/algorithm/apply_permutation.hpp | 1 - include/boost/algorithm/hex.hpp | 7 +- test/Jamfile.v2 | 1 + test/mclow.cpp | 15 + 9 files changed, 369 insertions(+), 225 deletions(-) create mode 100644 Jamfile create mode 100644 LICENSE create mode 100644 README.md create mode 100644 test/mclow.cpp diff --git a/.travis.yml b/.travis.yml index 11961b1b1..05e44aaa5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,171 +1,193 @@ -# Copyright 2016, 2017, 2018 Peter Dimov +# Copyright 2016 - 2018 Peter Dimov # Copyright 2018 T. Zachary Laine +# Copyright 2017 - 2019 James E. King III # Distributed under the Boost Software License, Version 1.0. # (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt) +# +# Generic Travis CI build script for boostorg repositories +# See: https://github.com/boostorg/boost-ci +# +# Instructions for customizing this script for your library: +# +# 1. Customize the compilers and language levels you want in the 'jobs'. +# 2. If you have more than include/, src/, test/, example/, examples/, or +# tools/ directories, modify your Travis CI project and add the environment +# variable DEPINST. For example if your build uses code in "bench/" and +# "fog/" directories, then set DEPINST to the following: +# --include bench --include fog +# 3. If you want to enable Coverity Scan, you need to provide the environment +# variables COVERITY_SCAN_TOKEN and COVERITY_SCAN_NOTIFICATION_EMAIL in +# your github settings. +# 4. Enable pull request builds in your boostorg/ account. +# +# That's it - the scripts will do everything else for you. + +dist: xenial language: cpp -sudo: false +env: + global: + # see: http://www.boost.org/build/doc/html/bbv2/overview/invocation.html#bbv2.overview.invocation.properties + # to use the default for a given environment, comment it out; recommend you build debug and release however.. + # - B2_ADDRESS_MODEL=address-model=64,32 + # - B2_LINK=link=shared,static + # - B2_THREADING=threading=multi,single + - B2_VARIANT=variant=release,debug + +install: + - git clone https://github.com/boostorg/boost-ci.git boost-ci + - cp -pr boost-ci/ci boost-ci/.codecov.yml . + - source ci/travis/install.sh + +addons: + apt: + packages: + - binutils-gold + - gdb + - libc6-dbg branches: only: - master - develop - - /feature\/.*/ - -env: - matrix: - - BOGUS_JOB=true - -matrix: + - bugfix/* + - feature/* + - fix/* + - pr/* - exclude: - - env: BOGUS_JOB=true +script: + - cd $BOOST_ROOT/libs/$SELF + - ci/travis/build.sh + +# +# Default toolsets in Ubuntu +# +# trusty xenial bionic +# 14.04 16.04 18.04 +# ------ ------ ------ +# clang 3.4 3.8 6.0 +# gcc 4.8.2 5.3.1 7.3.0 +# + +anchors: + clang-38: &clang-38 { apt: { packages: [ "clang-3.8", + "libstdc++-6-dev" ], sources: [ "llvm-toolchain-xenial-3.8", + "ubuntu-toolchain-r-test" ] } } + clang-4: &clang-4 { apt: { packages: [ "clang-4.0", + "libstdc++-6-dev" ], sources: [ "llvm-toolchain-xenial-4.0", + "ubuntu-toolchain-r-test" ] } } + clang-5: &clang-5 { apt: { packages: [ "clang-5.0", + "libstdc++-7-dev" ], sources: [ "llvm-toolchain-xenial-5.0", + "ubuntu-toolchain-r-test" ] } } + clang-6: &clang-6 { apt: { packages: [ "clang-6.0", + "libc6-dbg", + "libc++-dev", + "libstdc++-8-dev" ], sources: [ "llvm-toolchain-xenial-6.0", + "ubuntu-toolchain-r-test" ] } } + clang-7: &clang-7 { apt: { packages: [ "clang-7", + "libc6-dbg", + "libc++-dev", + "libstdc++-8-dev" ], sources: [ "llvm-toolchain-xenial-7", + "ubuntu-toolchain-r-test" ] } } + clang-8: &clang-8 { apt: { packages: [ "clang-8", + "libc6-dbg", + "libc++-dev", + "libstdc++-8-dev" ], sources: [ "llvm-toolchain-xenial-8", + "ubuntu-toolchain-r-test" ] } } + gcc-48: &gcc-48 { apt: { packages: [ "g++-4.8" ] } } + gcc-49: &gcc-49 { apt: { packages: [ "g++-4.9" ] } } + gcc-5: &gcc-5 { apt: { packages: [ "g++-5" ] } } + gcc-6: &gcc-6 { apt: { packages: [ "g++-6" ], sources: [ "ubuntu-toolchain-r-test" ] } } + gcc-7: &gcc-7 { apt: { packages: [ "g++-7" ], sources: [ "ubuntu-toolchain-r-test" ] } } + gcc-8: &gcc-8 { apt: { packages: [ "g++-8" ], sources: [ "ubuntu-toolchain-r-test" ] } } + +jobs: + allow_failures: + - env: + - COPY="all the environment settings from your job" include: - - os: linux - env: TOOLSET=gcc COMPILER=g++ CXXSTD=11 - - - os: linux - env: TOOLSET=gcc COMPILER=g++-4.7 CXXSTD=11 - addons: - apt: - packages: - - g++-4.7 - sources: - - ubuntu-toolchain-r-test + # libstdc++ + - { os: "linux", env: [ "B2_TOOLSET=gcc-4.8", "B2_CXXSTD=03,11" ], addons: *gcc-48 } + - { os: "linux", env: [ "B2_TOOLSET=gcc-4.9", "B2_CXXSTD=03,11" ], addons: *gcc-49 } + - { os: "linux", env: [ "B2_TOOLSET=gcc-5", "B2_CXXSTD=11" ], addons: *gcc-5 } + - { os: "linux", env: [ "B2_TOOLSET=gcc-6", "B2_CXXSTD=11,14" ], addons: *gcc-6 } + - { os: "linux", env: [ "B2_TOOLSET=gcc-7", "B2_CXXSTD=11,14,17" ], addons: *gcc-7 } + - { os: "linux", env: [ "B2_TOOLSET=gcc-8", "B2_CXXSTD=14,17,2a" ], addons: *gcc-8 } + - { os: "linux", env: [ "B2_TOOLSET=clang-3.8", "B2_CXXSTD=03,11,14" ], addons: *clang-38 } + - { os: "linux", env: [ "B2_TOOLSET=clang-4.0", "B2_CXXSTD=11,14" ], addons: *clang-4 } + - { os: "linux", env: [ "B2_TOOLSET=clang-5.0", "B2_CXXSTD=11,14,17" ], addons: *clang-5 } + - { os: "linux", env: [ "B2_TOOLSET=clang-6.0", "B2_CXXSTD=14,17,2a" ], addons: *clang-6 } + - { os: "linux", env: [ "B2_TOOLSET=clang-7", "B2_CXXSTD=14,17,2a" ], addons: *clang-7 } + - { os: "linux", env: [ "B2_TOOLSET=clang-8", "B2_CXXSTD=14,17,2a" ], addons: *clang-8 } + + # libc++ + - { os: "linux", env: [ "B2_TOOLSET=clang-6.0", "B2_CXXSTD=03,11,14,17,2a", + "B2_CXXFLAGS=-stdlib=libc++" ], addons: *clang-6 } + - { os: "osx" , env: [ "B2_TOOLSET=clang", "B2_CXXSTD=03,11,17" ] } + + # to enable Intel ICC define INTEL_ICC_SERIAL_NUMBER and the following: + # - { os: "linux", env: [ "B2_TOOLSET=intel-linux", "B2_CXXSTD=11,14,17" ], addons: *gcc-7, + # script: cd $BOOST_ROOT/libs/$SELF && ci/travis/intelicc.sh } - os: linux - env: TOOLSET=gcc COMPILER=g++-4.8 CXXSTD=11 - addons: - apt: - packages: - - g++-4.8 - sources: - - ubuntu-toolchain-r-test + env: + - COMMENT=codecov.io + - B2_TOOLSET=03,11,14 + - B2_TOOLSET=gcc-8 + - B2_DEFINES="define=BOOST_NO_STRESS_TEST=1" + addons: *gcc-8 + script: + - pushd /tmp && git clone https://github.com/linux-test-project/lcov.git && export PATH=/tmp/lcov/bin:$PATH && which lcov && lcov --version && popd + - cd $BOOST_ROOT/libs/$SELF + - ci/travis/codecov.sh - os: linux - env: TOOLSET=gcc COMPILER=g++-4.9 CXXSTD=11 - addons: - apt: - packages: - - g++-4.9 - sources: - - ubuntu-toolchain-r-test + env: + - COMMENT=cppcheck + script: + - cd $BOOST_ROOT/libs/$SELF + - ci/travis/cppcheck.sh - os: linux - env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=11,14,1z - addons: - apt: - packages: - - g++-5 - sources: - - ubuntu-toolchain-r-test + env: + - COMMENT=ubsan + - B2_VARIANT=variant=debug + - B2_TOOLSET=gcc-8 + - B2_CXXSTD=03,11,14,17,2a + - B2_DEFINES="define=BOOST_NO_STRESS_TEST=1" + - B2_CXXFLAGS="cxxflags=-fno-omit-frame-pointer cxxflags=-fsanitize=undefined cxxflags=-fno-sanitize-recover=all" + - B2_LINKFLAGS="linkflags=-fsanitize=undefined linkflags=-fno-sanitize-recover=all linkflags=-fuse-ld=gold" + - UBSAN_OPTIONS=print_stacktrace=1 + addons: *gcc-8 - os: linux - env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=11,14,1z - addons: - apt: - packages: - - g++-6 - sources: - - ubuntu-toolchain-r-test - - - os: linux - env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=11,14,1z CXXSTD_DIALECT=cxxstd-dialect=gnu - addons: - apt: - packages: - - g++-6 - sources: - - ubuntu-toolchain-r-test - + env: + - COMMENT=valgrind + - B2_TOOLSET=clang-6.0 + - B2_CXXSTD=03,11,14,17,2a + - B2_DEFINES="define=BOOST_NO_STRESS_TEST=1" + - B2_VARIANT=variant=debug + - B2_TESTFLAGS=testing.launcher=valgrind + - VALGRIND_OPTS=--error-exitcode=1 + addons: *clang-6 + script: + - cd $BOOST_ROOT/libs/$SELF + - ci/travis/valgrind.sh + + #################### Jobs to run on pushes to master, develop ################### + + # Coverity Scan - os: linux - env: TOOLSET=gcc COMPILER=g++-7 CXXSTD=11,14,17 - addons: - apt: - packages: - - g++-7 - sources: - - ubuntu-toolchain-r-test - - - os: linux - env: TOOLSET=clang COMPILER=clang++ CXXSTD=11 - - - os: linux - compiler: clang++-libc++ - env: TOOLSET=clang COMPILER=clang++-libc++ CXXSTD=11,14,1z - addons: - apt: - packages: - - libc++-dev - - - os: osx - env: TOOLSET=clang COMPILER=clang++ CXXSTD=11,14,1z - osx_image: xcode9.1 - - - os: osx - env: TOOLSET=clang COMPILER=clang++ CXXSTD=11,14,1z - osx_image: xcode9 - - - os: osx - env: TOOLSET=clang COMPILER=clang++ CXXSTD=11,14,1z - osx_image: xcode8.3 - - - os: osx - env: TOOLSET=clang COMPILER=clang++ CXXSTD=11,14,1z - osx_image: xcode8 - - - os: osx - env: TOOLSET=clang COMPILER=clang++ CXXSTD=11,14,1z - osx_image: xcode7.3 - - - os: osx - env: TOOLSET=clang COMPILER=clang++ CXXSTD=11,14,1z - osx_image: xcode6.4 - -install: - - BOOST_BRANCH=develop && [ "$TRAVIS_BRANCH" == "master" ] && BOOST_BRANCH=master || true - - cd .. - - git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root - - cd boost-root - - git submodule update --init tools/build - - git submodule update --init libs/config - - git submodule update --init libs/predef - - git submodule update --init libs/core - - git submodule update --init libs/detail - - git submodule update --init libs/range - - git submodule update --init libs/assert - - git submodule update --init libs/array - - git submodule update --init libs/type_traits - - git submodule update --init libs/static_assert - - git submodule update --init libs/iterator - - git submodule update --init libs/preprocessor - - git submodule update --init libs/mpl - - git submodule update --init libs/smart_ptr - - git submodule update --init libs/callable_traits - - git submodule update --init libs/type_index - - git submodule update --init libs/exception - - git submodule update --init libs/throw_exception - - git submodule update --init libs/utility - - git submodule update --init libs/bind - - git submodule update --init libs/ratio - - git submodule update --init libs/function - - git submodule update --init libs/integer - - git submodule update --init libs/numeric - - git submodule update --init libs/move - - git submodule update --init libs/container_hash - - git submodule update --init libs/io - - git submodule update --init libs/concept_check - - git submodule update --init libs/test - - git submodule update --init libs/timer - - git submodule update --init libs/chrono - - git submodule update --init libs/system - - cp -r $TRAVIS_BUILD_DIR/* libs/algorithm - - ./bootstrap.sh - - ./b2 headers - -script: - - |- - echo "using $TOOLSET : : $COMPILER ;" > ~/user-config.jam - - ./b2 -j3 libs/algorithm/test toolset=$TOOLSET cxxstd=$CXXSTD $CXXSTD_DIALECT + if: (env(COVERITY_SCAN_NOTIFICATION_EMAIL) IS present) AND (branch IN (develop, master)) AND (type IN (cron, push)) + env: + - COMMENT="Coverity Scan" + - B2_TOOLSET=clang + script: + - cd $BOOST_ROOT/libs/$SELF + - ci/travis/coverity.sh + +notifications: + email: + false diff --git a/Jamfile b/Jamfile new file mode 100644 index 000000000..a2dbf99e6 --- /dev/null +++ b/Jamfile @@ -0,0 +1,11 @@ +# Boost.Algorithm Library Jamfile +# +# Copyright (c) 2018 James E. King III +# +# Use, modification, and distribution are subject to 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) + +# please order by name to ease maintenance +build-project example ; +build-project test ; diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000..36b7cd93c --- /dev/null +++ b/LICENSE @@ -0,0 +1,23 @@ +Boost Software License - Version 1.0 - August 17th, 2003 + +Permission is hereby granted, free of charge, to any person or organization +obtaining a copy of the software and accompanying documentation covered by +this license (the "Software") to use, reproduce, display, distribute, +execute, and transmit the Software, and to prepare derivative works of the +Software, and to permit third-parties to whom the Software is furnished to +do so, all subject to the following: + +The copyright notices in the Software and this entire statement, including +the above license grant, this restriction and the following disclaimer, +must be included in all copies of the Software, in whole or in part, and +all derivative works of the Software, unless such copies or derivative +works are solely in the form of machine-executable object code generated by +a source language processor. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. diff --git a/README.md b/README.md new file mode 100644 index 000000000..d0d5752fa --- /dev/null +++ b/README.md @@ -0,0 +1,35 @@ +Algorithm, part of collection of the [Boost C++ Libraries](http://github.com/boostorg), is a collection of general purpose algorithms. + +### License + +Distributed under the [Boost Software License, Version 1.0](http://www.boost.org/LICENSE_1_0.txt). + +### Properties + +* C++03 +* Header-only + +### Build Status + +Branch | Travis | Appveyor | Coverity Scan | codecov.io | Deps | Docs | Tests | +:-------------: | ------ | -------- | ------------- | ---------- | ---- | ---- | ----- | +[`master`](https://github.com/boostorg/algorithm/tree/master) | [![Build Status](https://travis-ci.org/boostorg/algorithm.svg?branch=master)](https://travis-ci.org/boostorg/algorithm) | [![Build status](https://ci.appveyor.com/api/projects/status/FIXME/branch/master?svg=true)](https://ci.appveyor.com/project/USER/PROJECT/branch/master) | [![Coverity Scan Build Status](https://scan.coverity.com/projects/99999/badge.svg)](https://scan.coverity.com/projects/boostorg-algorithm) | [![codecov](https://codecov.io/gh/boostorg/algorithm/branch/master/graph/badge.svg)](https://codecov.io/gh/boostorg/algorithm/branch/master)| [![Deps](https://img.shields.io/badge/deps-master-brightgreen.svg)](https://pdimov.github.io/boostdep-report/master/algorithm.html) | [![Documentation](https://img.shields.io/badge/docs-master-brightgreen.svg)](http://www.boost.org/doc/libs/master/doc/html/algorithm.html) | [![Enter the Matrix](https://img.shields.io/badge/matrix-master-brightgreen.svg)](http://www.boost.org/development/tests/master/developer/algorithm.html) +[`develop`](https://github.com/boostorg/algorithm/tree/develop) | [![Build Status](https://travis-ci.org/boostorg/algorithm.svg?branch=develop)](https://travis-ci.org/boostorg/algorithm) | [![Build status](https://ci.appveyor.com/api/projects/status/FIXME/branch/develop?svg=true)](https://ci.appveyor.com/project/USER/PROJECT/branch/develop) | [![Coverity Scan Build Status](https://scan.coverity.com/projects/99999/badge.svg)](https://scan.coverity.com/projects/boostorg-algorithm) | [![codecov](https://codecov.io/gh/boostorg/algorithm/branch/develop/graph/badge.svg)](https://codecov.io/gh/boostorg/algorithm/branch/develop) | [![Deps](https://img.shields.io/badge/deps-develop-brightgreen.svg)](https://pdimov.github.io/boostdep-report/develop/algorithm.html) | [![Documentation](https://img.shields.io/badge/docs-develop-brightgreen.svg)](http://www.boost.org/doc/libs/develop/doc/html/algorithm.html) | [![Enter the Matrix](https://img.shields.io/badge/matrix-develop-brightgreen.svg)](http://www.boost.org/development/tests/develop/developer/algorithm.html) + +### Directories + +| Name | Purpose | +| ----------- | ------------------------------ | +| `doc` | documentation | +| `example` | examples | +| `include` | headers | +| `test` | unit tests | + +### More information + +* [Ask questions](http://stackoverflow.com/questions/ask?tags=c%2B%2B,boost,boost-algorithm) +* [Report bugs](https://github.com/boostorg/algorithm/issues): Be sure to mention Boost version, platform and compiler you're using. A small compilable code sample to reproduce the problem is always good as well. +* Submit your patches as pull requests against **develop** branch. Note that by submitting patches you agree to license your modifications under the [Boost Software License, Version 1.0](http://www.boost.org/LICENSE_1_0.txt). +* Discussions about the library are held on the [Boost developers mailing list](http://www.boost.org/community/groups.html#main). Be sure to read the [discussion policy](http://www.boost.org/community/policy.html) before posting and add the `[algorithm]` tag at the beginning of the subject line. + + diff --git a/appveyor.yml b/appveyor.yml index 6cdae8870..fa8e256a0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,24 @@ -# Copyright 2016 Peter Dimov +# Copyright 2016, 2017 Peter Dimov +# Copyright (C) 2017 - 2019 James E. King III # Distributed under the Boost Software License, Version 1.0. # (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt) +# +# Generic Appveyor build script for boostorg repositories +# See: https://github.com/boostorg/boost-ci/ +# +# Instructions for customizing this script for your library: +# +# 1. Customize the compilers and language levels you want. +# 2. If you have more than include/, src/, test/, example/, examples/, +# benchmark/ or tools/ directories, set the environment variable DEPINST. +# For example if your build uses code in "bench/" and "fog/" directories: +# - DEPINST: --include bench --include fog +# 3. Enable pull request builds in your boostorg/ account. +# +# That's it - the script will do everything else for you. +# + version: 1.0.{build}-{branch} shallow_clone: true @@ -10,84 +27,104 @@ branches: only: - master - develop + - bugfix/* + - feature/* + - fix/* + - pr/* -platform: - - x64 +matrix: + # Adding MAYFAIL to any matrix job allows it to fail but the build stays green: + allow_failures: + - MAYFAIL: true environment: + global: + # see: http://www.boost.org/build/doc/html/bbv2/overview/invocation.html#bbv2.overview.invocation.properties + # to use the default for a given environment, comment it out; recommend you build debug and release however: + # on Windows it is important to exercise all the possibilities, especially shared vs static, however most + # libraries that care about this exercise it in their Jamfiles... + # B2_ADDRESS_MODEL: address-model=64,32 + # B2_LINK: link=shared,static + # B2_THREADING: threading=multi,single + B2_VARIANT: variant=release,debug + matrix: - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - ARGS: --toolset=msvc-14.1 address-model=64 - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - ARGS: --toolset=msvc-14.1 address-model=32 - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - ARGS: --toolset=msvc-14.1 address-model=64 cxxflags=-std:c++latest cxxflags=-permissive- - - ARGS: --toolset=msvc-9.0 address-model=32 - - ARGS: --toolset=msvc-10.0 address-model=32 - - ARGS: --toolset=msvc-11.0 address-model=32 - - ARGS: --toolset=msvc-12.0 address-model=32 - - ARGS: --toolset=msvc-14.0 address-model=32 - - ARGS: --toolset=msvc-12.0 address-model=64 - - ARGS: --toolset=msvc-14.0 address-model=64 - - ARGS: --toolset=msvc-14.0 address-model=64 cxxflags=-std:c++latest - - ARGS: --toolset=gcc address-model=64 - CXXSTD: 03,11,14,1z - PATH: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH% - - ARGS: --toolset=gcc address-model=64 - CXXSTD: 03,11,14,1z - PATH: C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH% - - ARGS: --toolset=gcc address-model=32 linkflags=-Wl,-allow-multiple-definition - CXXSTD: 03,11,14,1z - PATH: C:\MinGW\bin;%PATH% - - ARGS: --toolset=gcc address-model=64 - CXXSTD: 03,11,14,1z - PATH: C:\cygwin64\bin;%PATH% - - ARGS: --toolset=gcc address-model=32 - CXXSTD: 03,11,14,1z - PATH: C:\cygwin\bin;%PATH% + - FLAVOR: Visual Studio 2017 C++2a Strict + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + B2_ADDRESS_MODEL: address-model=64 + B2_CXXFLAGS: cxxflags=-permissive- + B2_CXXSTD: latest # 2a + B2_TOOLSET: msvc-14.1 + + - FLAVOR: Visual Studio 2017 C++17 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + B2_ADDRESS_MODEL: address-model=64 + B2_CXXSTD: 17 + B2_TOOLSET: msvc-14.1 + + - FLAVOR: Visual Studio 2017 C++14 (Default) + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + B2_ADDRESS_MODEL: address-model=64,32 + B2_TOOLSET: msvc-14.1 + + - FLAVOR: Visual Studio 2015 C++14 (Default) + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + B2_ADDRESS_MODEL: address-model=64,32 + B2_TOOLSET: msvc-14.0 + + - FLAVOR: Visual Studio 2010, 2012, 2013 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + B2_TOOLSET: msvc-10.0,msvc-11.0,msvc-12.0 + + - FLAVOR: cygwin (32-bit) + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + ADDPATH: C:\cygwin\bin; + B2_ADDRESS_MODEL: address-model=32 + B2_CXXSTD: 03,11 + # https://github.com/boostorg/test/issues/144 + B2_DEFINES: define=_POSIX_C_SOURCE=200112L + B2_THREADING: threadapi=pthread + B2_TOOLSET: gcc + + - FLAVOR: cygwin (64-bit) + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + ADDPATH: C:\cygwin64\bin; + B2_ADDRESS_MODEL: address-model=64 + B2_CXXSTD: 11,17 + # https://github.com/boostorg/test/issues/144 + B2_DEFINES: define=_POSIX_C_SOURCE=200112L define=__USE_ISOC99 + B2_THREADING: threadapi=pthread + B2_TOOLSET: gcc + + - FLAVOR: mingw32 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + ARCH: i686 + B2_ADDRESS_MODEL: address-model=32 + B2_CXXSTD: 03,11 + SCRIPT: ci\appveyor\mingw.bat + + - FLAVOR: mingw64 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + ARCH: x86_64 + B2_ADDRESS_MODEL: address-model=64 + B2_CXXSTD: 11,17 + B2_DEFINES: define=__USE_ISOC99 + SCRIPT: ci\appveyor\mingw.bat install: - - cd .. - - git clone -b %APPVEYOR_REPO_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root - - cd boost-root - - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\algorithm - - git submodule update --init tools/build - - git submodule update --init libs/config - - git submodule update --init libs/predef - - git submodule update --init libs/core - - git submodule update --init libs/detail - - git submodule update --init libs/range - - git submodule update --init libs/assert - - git submodule update --init libs/array - - git submodule update --init libs/type_traits - - git submodule update --init libs/static_assert - - git submodule update --init libs/iterator - - git submodule update --init libs/preprocessor - - git submodule update --init libs/mpl - - git submodule update --init libs/smart_ptr - - git submodule update --init libs/callable_traits - - git submodule update --init libs/type_index - - git submodule update --init libs/exception - - git submodule update --init libs/throw_exception - - git submodule update --init libs/utility - - git submodule update --init libs/bind - - git submodule update --init libs/ratio - - git submodule update --init libs/function - - git submodule update --init libs/integer - - git submodule update --init libs/numeric - - git submodule update --init libs/move - - git submodule update --init libs/container_hash - - git submodule update --init libs/io - - git submodule update --init libs/concept_check - - git submodule update --init libs/test - - git submodule update --init libs/timer - - git submodule update --init libs/chrono - - git submodule update --init libs/system - - bootstrap - - b2 headers - + - set SELF=%APPVEYOR_PROJECT_NAME:-=_% + - git clone https://github.com/boostorg/boost-ci.git C:\boost-ci + - xcopy /s /e /q /i C:\boost-ci\ci .\ci + - ci\appveyor\install.bat + build: off test_script: - - cd libs\config\test - - ..\..\..\b2 -j3 %ARGS% cxxstd=%CXXSTD% + - set SELF=%APPVEYOR_PROJECT_NAME:-=_% + - PATH=%ADDPATH%%PATH% + # The definition of B2_TOOLCXX omits B2_CXXSTD= if it was not defined above + - IF NOT DEFINED B2_CXXSTD (SET B2_TOOLCXX=toolset=%B2_TOOLSET%) ELSE (SET B2_TOOLCXX=toolset=%B2_TOOLSET% cxxstd=%B2_CXXSTD%) + # Echo the complete build command to the build log + - IF NOT DEFINED SCRIPT (ECHO b2 libs/%SELF:\=/% %B2_TOOLCXX% %B2_CXXFLAGS% %B2_DEFINES% %B2_THREADING% %B2_ADDRESS_MODEL% %B2_LINK% %B2_THREADING% %B2_VARIANT% -j3) + # Now go build... + - IF DEFINED SCRIPT (call libs\%SELF%\%SCRIPT%) ELSE (b2 libs/%SELF:\=/% %B2_TOOLCXX% %B2_CXXFLAGS% %B2_DEFINES% %B2_THREADING% %B2_ADDRESS_MODEL% %B2_LINK% %B2_THREADING% %B2_VARIANT% -j3) diff --git a/include/boost/algorithm/apply_permutation.hpp b/include/boost/algorithm/apply_permutation.hpp index b9de0ded7..7e590092e 100644 --- a/include/boost/algorithm/apply_permutation.hpp +++ b/include/boost/algorithm/apply_permutation.hpp @@ -19,7 +19,6 @@ #define BOOST_ALGORITHM_APPLY_PERMUTATION_HPP #include -#include #include #include diff --git a/include/boost/algorithm/hex.hpp b/include/boost/algorithm/hex.hpp index b8335843a..3cba2f958 100644 --- a/include/boost/algorithm/hex.hpp +++ b/include/boost/algorithm/hex.hpp @@ -23,6 +23,7 @@ #include // for std::iterator_traits #include +#include #include #include #include @@ -47,9 +48,9 @@ namespace boost { namespace algorithm { \brief Thrown when the input sequence unexpectedly ends */ -struct hex_decode_error : virtual boost::exception, virtual std::exception {}; -struct not_enough_input : virtual hex_decode_error {}; -struct non_hex_input : virtual hex_decode_error {}; +struct BOOST_SYMBOL_VISIBLE hex_decode_error : virtual boost::exception, virtual std::exception {}; +struct BOOST_SYMBOL_VISIBLE not_enough_input : virtual hex_decode_error {}; +struct BOOST_SYMBOL_VISIBLE non_hex_input : virtual hex_decode_error {}; typedef boost::error_info bad_char; namespace detail { diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index e7091e05e..bf4f0adfc 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -68,6 +68,7 @@ alias unit_test_framework [ run hex_test2.cpp unit_test_framework : : : : hex_test2 ] [ run hex_test3.cpp unit_test_framework : : : : hex_test3 ] [ run hex_test4.cpp unit_test_framework : : : : hex_test4 ] + [ run mclow.cpp unit_test_framework : : : : mclow ] [ compile-fail hex_fail1.cpp ] # Gather tests diff --git a/test/mclow.cpp b/test/mclow.cpp new file mode 100644 index 000000000..79e06cc2b --- /dev/null +++ b/test/mclow.cpp @@ -0,0 +1,15 @@ +#include + +#include +#include + +struct hex_decode_error : virtual boost::exception, virtual std::exception {}; +struct not_enough_input : virtual hex_decode_error {}; +struct non_hex_input : virtual hex_decode_error {}; + +void toss() { BOOST_THROW_EXCEPTION(not_enough_input()); } + +int main () { + try { toss(); } + catch ( const hex_decode_error & /*ex*/ ) {} + } From 0a57ec30a2bc889bfcbbdb9df901125f50d81516 Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Wed, 3 Jul 2019 07:44:25 -0700 Subject: [PATCH 06/63] Update the apply_permutation tests to use the BOOST_CHECK_EQUAL_COLLECTIONS facilities. Based on https://github.com/boostorg/algorithm/pull/42 Thanks to Jeremy for the patch --- test/apply_permutation_test.cpp | 40 ++++++++++++++------------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/test/apply_permutation_test.cpp b/test/apply_permutation_test.cpp index 3dbb7e1b4..94a60ac79 100644 --- a/test/apply_permutation_test.cpp +++ b/test/apply_permutation_test.cpp @@ -14,19 +14,19 @@ #define BOOST_TEST_MAIN -#include +#include namespace ba = boost::algorithm; -void test_apply_permutation() +BOOST_AUTO_TEST_CASE(test_apply_permutation) { //Empty { std::vector vec, order, result; ba::apply_permutation(vec.begin(), vec.end(), order.begin(), order.end()); - BOOST_CHECK(vec == result); + BOOST_CHECK_EQUAL_COLLECTIONS(vec.begin(), vec.end(), result.begin(), result.end()); } //1 element { @@ -36,7 +36,7 @@ void test_apply_permutation() result = vec; ba::apply_permutation(vec.begin(), vec.end(), order.begin(), order.end()); - BOOST_CHECK(vec == result); + BOOST_CHECK_EQUAL_COLLECTIONS(vec.begin(), vec.end(), result.begin(), result.end()); } //2 elements, no changes { @@ -46,7 +46,7 @@ void test_apply_permutation() result = vec; ba::apply_permutation(vec.begin(), vec.end(), order.begin(), order.end()); - BOOST_CHECK(vec == result); + BOOST_CHECK_EQUAL_COLLECTIONS(vec.begin(), vec.end(), result.begin(), result.end()); } //2 elements, changed { @@ -56,7 +56,7 @@ void test_apply_permutation() result.push_back(2); result.push_back(1); ba::apply_permutation(vec.begin(), vec.end(), order.begin(), order.end()); - BOOST_CHECK(vec == result); + BOOST_CHECK_EQUAL_COLLECTIONS(vec.begin(), vec.end(), result.begin(), result.end()); } //Multiple elements, no changes { @@ -66,7 +66,7 @@ void test_apply_permutation() result = vec; ba::apply_permutation(vec.begin(), vec.end(), order.begin(), order.end()); - BOOST_CHECK(vec == result); + BOOST_CHECK_EQUAL_COLLECTIONS(vec.begin(), vec.end(), result.begin(), result.end()); } //Multiple elements, changed { @@ -76,7 +76,7 @@ void test_apply_permutation() result.push_back(5); result.push_back(4); result.push_back(3); result.push_back(2); result.push_back(1); ba::apply_permutation(vec.begin(), vec.end(), order.begin(), order.end()); - BOOST_CHECK(vec == result); + BOOST_CHECK_EQUAL_COLLECTIONS(vec.begin(), vec.end(), result.begin(), result.end()); } //Just test range interface { @@ -86,18 +86,18 @@ void test_apply_permutation() result = vec; ba::apply_permutation(vec, order); - BOOST_CHECK(vec == result); + BOOST_CHECK_EQUAL_COLLECTIONS(vec.begin(), vec.end(), result.begin(), result.end()); } } -void test_apply_reverse_permutation() +BOOST_AUTO_TEST_CASE(test_apply_reverse_permutation) { //Empty { std::vector vec, order, result; ba::apply_reverse_permutation(vec.begin(), vec.end(), order.begin(), order.end()); - BOOST_CHECK(vec == result); + BOOST_CHECK_EQUAL_COLLECTIONS(vec.begin(), vec.end(), result.begin(), result.end()); } //1 element { @@ -107,7 +107,7 @@ void test_apply_reverse_permutation() result = vec; ba::apply_reverse_permutation(vec.begin(), vec.end(), order.begin(), order.end()); - BOOST_CHECK(vec == result); + BOOST_CHECK_EQUAL_COLLECTIONS(vec.begin(), vec.end(), result.begin(), result.end()); } //2 elements, no changes { @@ -117,7 +117,7 @@ void test_apply_reverse_permutation() result = vec; ba::apply_reverse_permutation(vec.begin(), vec.end(), order.begin(), order.end()); - BOOST_CHECK(vec == result); + BOOST_CHECK_EQUAL_COLLECTIONS(vec.begin(), vec.end(), result.begin(), result.end()); } //2 elements, changed { @@ -127,7 +127,7 @@ void test_apply_reverse_permutation() result.push_back(2); result.push_back(1); ba::apply_reverse_permutation(vec.begin(), vec.end(), order.begin(), order.end()); - BOOST_CHECK(vec == result); + BOOST_CHECK_EQUAL_COLLECTIONS(vec.begin(), vec.end(), result.begin(), result.end()); } //Multiple elements, no changes { @@ -137,7 +137,7 @@ void test_apply_reverse_permutation() result = vec; ba::apply_reverse_permutation(vec.begin(), vec.end(), order.begin(), order.end()); - BOOST_CHECK(vec == result); + BOOST_CHECK_EQUAL_COLLECTIONS(vec.begin(), vec.end(), result.begin(), result.end()); } //Multiple elements, changed { @@ -147,7 +147,7 @@ void test_apply_reverse_permutation() result.push_back(5); result.push_back(4); result.push_back(3); result.push_back(2); result.push_back(1); ba::apply_reverse_permutation(vec.begin(), vec.end(), order.begin(), order.end()); - BOOST_CHECK(vec == result); + BOOST_CHECK_EQUAL_COLLECTIONS(vec.begin(), vec.end(), result.begin(), result.end()); } //Just test range interface { @@ -157,12 +157,6 @@ void test_apply_reverse_permutation() result = vec; ba::apply_reverse_permutation(vec, order); - BOOST_CHECK(vec == result); + BOOST_CHECK_EQUAL_COLLECTIONS(vec.begin(), vec.end(), result.begin(), result.end()); } } - -BOOST_AUTO_TEST_CASE(test_main) -{ - test_apply_permutation(); - test_apply_reverse_permutation(); -} From 9093abbda95588f2f8c9cd875c1c2058075e05ff Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Wed, 27 Nov 2019 10:58:37 -0800 Subject: [PATCH 07/63] Update examples so that they build --- example/Jamfile.v2 | 8 ++++---- example/is_partitioned_until_example.cpp | 4 ++-- example/search_example.cpp | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/example/Jamfile.v2 b/example/Jamfile.v2 index 100878c30..64a405559 100644 --- a/example/Jamfile.v2 +++ b/example/Jamfile.v2 @@ -18,8 +18,8 @@ project /boost/algorithm/example : ; -exe clamp_example : clamp_example.cpp ; +exe clamp_example : clamp_example.cpp : ; exe search_example : search_example.cpp ; -exe is_palindrome_example : is_palindrome_example.cpp; -exe is_partitioned_until_example : is_partitioned_until_example.cpp; -exe apply_permutation_example : apply_permutation_example.cpp; +exe is_palindrome_example : is_palindrome_example.cpp : 11 ; +exe is_partitioned_until_example : is_partitioned_until_example.cpp : 11 ; +exe apply_permutation_example : apply_permutation_example.cpp : 11 ; diff --git a/example/is_partitioned_until_example.cpp b/example/is_partitioned_until_example.cpp index 759176b27..4bf44e831 100644 --- a/example/is_partitioned_until_example.cpp +++ b/example/is_partitioned_until_example.cpp @@ -32,8 +32,8 @@ struct isOddComp int main ( int /*argc*/, char * /*argv*/ [] ) { - std::vector good({1, 2, 4}); - std::vector bad({1, 2, 3}); + std::vector good{1, 2, 4}; + std::vector bad{1, 2, 3}; //Use custom function auto it1 = ba::is_partitioned_until(good.begin(), good.end(), isOdd); diff --git a/example/search_example.cpp b/example/search_example.cpp index 438bee9ad..3ae6911e5 100644 --- a/example/search_example.cpp +++ b/example/search_example.cpp @@ -27,7 +27,7 @@ int main ( int /*argc*/, char * /*argv*/ [] ) { // algorithms. They all have the same (dual) interface. // There is a procedural interface, based on std::search: - if ( ba::boyer_moore_search ( haystack.begin (), haystack.end (), needle1.begin (), needle1.end ()) != haystack.end ()) + if ( ba::boyer_moore_search ( haystack.begin (), haystack.end (), needle1.begin (), needle1.end ()) != std::make_pair(haystack.end(), haystack.end())) std::cout << "Found '" << needle1 << "' in '" << haystack << "' (boyer-moore 1)" << std::endl; else std::cout << "Did NOT find '" << needle1 << "' in '" << haystack << "' (boyer-moore 1)" << std::endl; @@ -36,19 +36,19 @@ int main ( int /*argc*/, char * /*argv*/ [] ) { // you can create a search object and use that over and over again - amortizing the setup // costs across several searches ba::boyer_moore search1 ( needle1.begin (), needle1.end ()); - if ( search1 ( haystack.begin (), haystack.end ()) != haystack.end ()) + if ( search1 ( haystack.begin (), haystack.end ()) != std::make_pair(haystack.end(), haystack.end())) std::cout << "Found '" << needle1 << "' in '" << haystack << "' (boyer-moore 2)" << std::endl; else std::cout << "Did NOT find '" << needle1 << "' in '" << haystack << "' (boyer-moore 2)" << std::endl; // There is also an implementation of boyer-moore-horspool searching - if ( ba::boyer_moore_horspool_search ( haystack.begin (), haystack.end (), needle1.begin (), needle1.end ()) != haystack.end ()) + if ( ba::boyer_moore_horspool_search ( haystack.begin (), haystack.end (), needle1.begin (), needle1.end ()) != std::make_pair(haystack.end(), haystack.end())) std::cout << "Found '" << needle1 << "' in '" << haystack << "' (boyer-moore-horspool)" << std::endl; else std::cout << "Did NOT find '" << needle1 << "' in '" << haystack << "' (boyer-moore-horspool)" << std::endl; // And also the knuth-pratt-morris search algorithm - if ( ba::knuth_morris_pratt_search ( haystack.begin (), haystack.end (), needle1.begin (), needle1.end ()) != haystack.end ()) + if ( ba::knuth_morris_pratt_search ( haystack.begin (), haystack.end (), needle1.begin (), needle1.end ()) != std::make_pair(haystack.end(), haystack.end())) std::cout << "Found '" << needle1 << "' in '" << haystack << "' (knuth_morris_pratt)" << std::endl; else std::cout << "Did NOT find '" << needle1 << "' in '" << haystack << "' (knuth_morris_pratt)" << std::endl; From 9ef3df0d0b628917810d04d2b8e8aab4175e80be Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Tue, 3 Dec 2019 08:33:05 -0800 Subject: [PATCH 08/63] Update header files to always include boost/config.hpp. Fixes issue #61 --- include/boost/algorithm/algorithm.hpp | 1 + include/boost/algorithm/apply_permutation.hpp | 1 + include/boost/algorithm/clamp.hpp | 1 + include/boost/algorithm/cxx11/all_of.hpp | 1 + include/boost/algorithm/cxx11/any_of.hpp | 1 + include/boost/algorithm/cxx11/copy_if.hpp | 2 ++ include/boost/algorithm/cxx11/copy_n.hpp | 2 ++ include/boost/algorithm/cxx11/find_if_not.hpp | 1 + include/boost/algorithm/cxx11/iota.hpp | 1 + include/boost/algorithm/cxx11/is_partitioned.hpp | 1 + include/boost/algorithm/cxx11/is_permutation.hpp | 1 + include/boost/algorithm/cxx11/is_sorted.hpp | 1 + include/boost/algorithm/cxx11/none_of.hpp | 1 + include/boost/algorithm/cxx11/one_of.hpp | 6 ++++-- include/boost/algorithm/cxx11/partition_point.hpp | 1 + include/boost/algorithm/cxx14/equal.hpp | 2 ++ include/boost/algorithm/cxx14/is_permutation.hpp | 1 + include/boost/algorithm/cxx14/mismatch.hpp | 1 + include/boost/algorithm/cxx17/exclusive_scan.hpp | 1 + include/boost/algorithm/cxx17/for_each_n.hpp | 2 ++ include/boost/algorithm/cxx17/inclusive_scan.hpp | 1 + include/boost/algorithm/cxx17/reduce.hpp | 1 + include/boost/algorithm/cxx17/transform_exclusive_scan.hpp | 1 + include/boost/algorithm/cxx17/transform_inclusive_scan.hpp | 1 + include/boost/algorithm/cxx17/transform_reduce.hpp | 1 + include/boost/algorithm/find_backward.hpp | 5 ++--- include/boost/algorithm/find_not.hpp | 5 ++--- include/boost/algorithm/gather.hpp | 1 + include/boost/algorithm/hex.hpp | 1 + include/boost/algorithm/is_palindrome.hpp | 1 + include/boost/algorithm/is_partitioned_until.hpp | 1 + include/boost/algorithm/minmax.hpp | 1 + include/boost/algorithm/minmax_element.hpp | 2 ++ include/boost/algorithm/searching/boyer_moore.hpp | 1 + include/boost/algorithm/searching/boyer_moore_horspool.hpp | 1 + include/boost/algorithm/searching/knuth_morris_pratt.hpp | 1 + include/boost/algorithm/sort_subrange.hpp | 1 + 37 files changed, 47 insertions(+), 8 deletions(-) diff --git a/include/boost/algorithm/algorithm.hpp b/include/boost/algorithm/algorithm.hpp index 2bbee1d2d..76753cd67 100644 --- a/include/boost/algorithm/algorithm.hpp +++ b/include/boost/algorithm/algorithm.hpp @@ -19,6 +19,7 @@ #include // for plus and multiplies +#include #include // for boost::disable_if #include diff --git a/include/boost/algorithm/apply_permutation.hpp b/include/boost/algorithm/apply_permutation.hpp index b9de0ded7..225ae5783 100644 --- a/include/boost/algorithm/apply_permutation.hpp +++ b/include/boost/algorithm/apply_permutation.hpp @@ -21,6 +21,7 @@ #include #include +#include #include #include diff --git a/include/boost/algorithm/clamp.hpp b/include/boost/algorithm/clamp.hpp index d027acdf2..82a99bde0 100644 --- a/include/boost/algorithm/clamp.hpp +++ b/include/boost/algorithm/clamp.hpp @@ -23,6 +23,7 @@ #include // For std::iterator_traits #include +#include #include #include #include // for identity diff --git a/include/boost/algorithm/cxx11/all_of.hpp b/include/boost/algorithm/cxx11/all_of.hpp index 527bbd50f..f7ee311b2 100644 --- a/include/boost/algorithm/cxx11/all_of.hpp +++ b/include/boost/algorithm/cxx11/all_of.hpp @@ -12,6 +12,7 @@ #ifndef BOOST_ALGORITHM_ALL_OF_HPP #define BOOST_ALGORITHM_ALL_OF_HPP +#include #include #include diff --git a/include/boost/algorithm/cxx11/any_of.hpp b/include/boost/algorithm/cxx11/any_of.hpp index d9e241413..51dfba193 100644 --- a/include/boost/algorithm/cxx11/any_of.hpp +++ b/include/boost/algorithm/cxx11/any_of.hpp @@ -14,6 +14,7 @@ #ifndef BOOST_ALGORITHM_ANY_OF_HPP #define BOOST_ALGORITHM_ANY_OF_HPP +#include #include #include diff --git a/include/boost/algorithm/cxx11/copy_if.hpp b/include/boost/algorithm/cxx11/copy_if.hpp index dc1fdeff3..d3914bf20 100644 --- a/include/boost/algorithm/cxx11/copy_if.hpp +++ b/include/boost/algorithm/cxx11/copy_if.hpp @@ -13,6 +13,8 @@ #define BOOST_ALGORITHM_COPY_IF_HPP #include // for std::pair, std::make_pair + +#include #include #include diff --git a/include/boost/algorithm/cxx11/copy_n.hpp b/include/boost/algorithm/cxx11/copy_n.hpp index e4bebd076..a0130fabe 100644 --- a/include/boost/algorithm/cxx11/copy_n.hpp +++ b/include/boost/algorithm/cxx11/copy_n.hpp @@ -12,6 +12,8 @@ #ifndef BOOST_ALGORITHM_COPY_N_HPP #define BOOST_ALGORITHM_COPY_N_HPP +#include + namespace boost { namespace algorithm { /// \fn copy_n ( InputIterator first, Size n, OutputIterator result ) diff --git a/include/boost/algorithm/cxx11/find_if_not.hpp b/include/boost/algorithm/cxx11/find_if_not.hpp index 6f5799a33..cc81d2975 100644 --- a/include/boost/algorithm/cxx11/find_if_not.hpp +++ b/include/boost/algorithm/cxx11/find_if_not.hpp @@ -12,6 +12,7 @@ #ifndef BOOST_ALGORITHM_FIND_IF_NOT_HPP #define BOOST_ALGORITHM_FIND_IF_NOT_HPP +#include #include #include diff --git a/include/boost/algorithm/cxx11/iota.hpp b/include/boost/algorithm/cxx11/iota.hpp index 6efc4d8dc..e8b2b62ff 100644 --- a/include/boost/algorithm/cxx11/iota.hpp +++ b/include/boost/algorithm/cxx11/iota.hpp @@ -12,6 +12,7 @@ #ifndef BOOST_ALGORITHM_IOTA_HPP #define BOOST_ALGORITHM_IOTA_HPP +#include #include #include diff --git a/include/boost/algorithm/cxx11/is_partitioned.hpp b/include/boost/algorithm/cxx11/is_partitioned.hpp index fb2c5a17a..47abc2c8d 100644 --- a/include/boost/algorithm/cxx11/is_partitioned.hpp +++ b/include/boost/algorithm/cxx11/is_partitioned.hpp @@ -12,6 +12,7 @@ #ifndef BOOST_ALGORITHM_IS_PARTITIONED_HPP #define BOOST_ALGORITHM_IS_PARTITIONED_HPP +#include #include #include diff --git a/include/boost/algorithm/cxx11/is_permutation.hpp b/include/boost/algorithm/cxx11/is_permutation.hpp index 0098cd53f..31eac939d 100644 --- a/include/boost/algorithm/cxx11/is_permutation.hpp +++ b/include/boost/algorithm/cxx11/is_permutation.hpp @@ -17,6 +17,7 @@ #include // for std::equal_to #include +#include #include #include #include diff --git a/include/boost/algorithm/cxx11/is_sorted.hpp b/include/boost/algorithm/cxx11/is_sorted.hpp index 276621161..0aa812236 100644 --- a/include/boost/algorithm/cxx11/is_sorted.hpp +++ b/include/boost/algorithm/cxx11/is_sorted.hpp @@ -16,6 +16,7 @@ #include #include +#include #include #include diff --git a/include/boost/algorithm/cxx11/none_of.hpp b/include/boost/algorithm/cxx11/none_of.hpp index e537c2673..715c9ab01 100644 --- a/include/boost/algorithm/cxx11/none_of.hpp +++ b/include/boost/algorithm/cxx11/none_of.hpp @@ -12,6 +12,7 @@ #ifndef BOOST_ALGORITHM_NONE_OF_HPP #define BOOST_ALGORITHM_NONE_OF_HPP +#include #include #include diff --git a/include/boost/algorithm/cxx11/one_of.hpp b/include/boost/algorithm/cxx11/one_of.hpp index 3b95180dc..52f77b675 100644 --- a/include/boost/algorithm/cxx11/one_of.hpp +++ b/include/boost/algorithm/cxx11/one_of.hpp @@ -12,11 +12,13 @@ #ifndef BOOST_ALGORITHM_ONE_OF_HPP #define BOOST_ALGORITHM_ONE_OF_HPP -#include - +#include #include #include +#include + + namespace boost { namespace algorithm { /// \fn one_of ( InputIterator first, InputIterator last, Predicate p ) diff --git a/include/boost/algorithm/cxx11/partition_point.hpp b/include/boost/algorithm/cxx11/partition_point.hpp index 2c2767ae5..aa184acbf 100644 --- a/include/boost/algorithm/cxx11/partition_point.hpp +++ b/include/boost/algorithm/cxx11/partition_point.hpp @@ -14,6 +14,7 @@ #include // for std::distance, advance +#include #include #include diff --git a/include/boost/algorithm/cxx14/equal.hpp b/include/boost/algorithm/cxx14/equal.hpp index 526aae996..a1501baf9 100644 --- a/include/boost/algorithm/cxx14/equal.hpp +++ b/include/boost/algorithm/cxx14/equal.hpp @@ -14,6 +14,8 @@ #include +#include + namespace boost { namespace algorithm { namespace detail { diff --git a/include/boost/algorithm/cxx14/is_permutation.hpp b/include/boost/algorithm/cxx14/is_permutation.hpp index 639446bf3..e889347db 100644 --- a/include/boost/algorithm/cxx14/is_permutation.hpp +++ b/include/boost/algorithm/cxx14/is_permutation.hpp @@ -16,6 +16,7 @@ #include // for std::equal_to #include +#include #include #include diff --git a/include/boost/algorithm/cxx14/mismatch.hpp b/include/boost/algorithm/cxx14/mismatch.hpp index 46017190d..a1fafe80d 100644 --- a/include/boost/algorithm/cxx14/mismatch.hpp +++ b/include/boost/algorithm/cxx14/mismatch.hpp @@ -13,6 +13,7 @@ #define BOOST_ALGORITHM_MISMATCH_HPP #include // for std::pair + #include namespace boost { namespace algorithm { diff --git a/include/boost/algorithm/cxx17/exclusive_scan.hpp b/include/boost/algorithm/cxx17/exclusive_scan.hpp index e4ec112d2..9dbfbe966 100644 --- a/include/boost/algorithm/cxx17/exclusive_scan.hpp +++ b/include/boost/algorithm/cxx17/exclusive_scan.hpp @@ -15,6 +15,7 @@ #include // for std::plus #include // for std::iterator_traits +#include #include #include #include diff --git a/include/boost/algorithm/cxx17/for_each_n.hpp b/include/boost/algorithm/cxx17/for_each_n.hpp index 71f6cde3c..59abb448d 100644 --- a/include/boost/algorithm/cxx17/for_each_n.hpp +++ b/include/boost/algorithm/cxx17/for_each_n.hpp @@ -14,6 +14,8 @@ #include // for std::pair +#include + namespace boost { namespace algorithm { /// \fn for_each_n(InputIterator first, Size n, Function f); diff --git a/include/boost/algorithm/cxx17/inclusive_scan.hpp b/include/boost/algorithm/cxx17/inclusive_scan.hpp index 5c60c39d2..57812670a 100644 --- a/include/boost/algorithm/cxx17/inclusive_scan.hpp +++ b/include/boost/algorithm/cxx17/inclusive_scan.hpp @@ -15,6 +15,7 @@ #include // for std::plus #include // for std::iterator_traits +#include #include #include #include diff --git a/include/boost/algorithm/cxx17/reduce.hpp b/include/boost/algorithm/cxx17/reduce.hpp index 55424b6e5..35f217cf1 100644 --- a/include/boost/algorithm/cxx17/reduce.hpp +++ b/include/boost/algorithm/cxx17/reduce.hpp @@ -15,6 +15,7 @@ #include // for std::plus #include // for std::iterator_traits +#include #include #include #include diff --git a/include/boost/algorithm/cxx17/transform_exclusive_scan.hpp b/include/boost/algorithm/cxx17/transform_exclusive_scan.hpp index dd3c9c834..68318a59a 100644 --- a/include/boost/algorithm/cxx17/transform_exclusive_scan.hpp +++ b/include/boost/algorithm/cxx17/transform_exclusive_scan.hpp @@ -15,6 +15,7 @@ #include // for std::plus #include // for std::iterator_traits +#include #include #include #include diff --git a/include/boost/algorithm/cxx17/transform_inclusive_scan.hpp b/include/boost/algorithm/cxx17/transform_inclusive_scan.hpp index 1d1197656..31607703e 100644 --- a/include/boost/algorithm/cxx17/transform_inclusive_scan.hpp +++ b/include/boost/algorithm/cxx17/transform_inclusive_scan.hpp @@ -15,6 +15,7 @@ #include // for std::plus #include // for std::iterator_traits +#include #include #include #include diff --git a/include/boost/algorithm/cxx17/transform_reduce.hpp b/include/boost/algorithm/cxx17/transform_reduce.hpp index 869638476..1bef5d1ab 100644 --- a/include/boost/algorithm/cxx17/transform_reduce.hpp +++ b/include/boost/algorithm/cxx17/transform_reduce.hpp @@ -15,6 +15,7 @@ #include // for std::plus #include // for std::iterator_traits +#include #include #include #include diff --git a/include/boost/algorithm/find_backward.hpp b/include/boost/algorithm/find_backward.hpp index 6102c9ab2..590320349 100644 --- a/include/boost/algorithm/find_backward.hpp +++ b/include/boost/algorithm/find_backward.hpp @@ -7,13 +7,12 @@ #ifndef BOOST_ALGORITHM_FIND_BACKWARD_HPP #define BOOST_ALGORITHM_FIND_BACKWARD_HPP +#include + #include #include #include -#include - - namespace boost { namespace algorithm { template diff --git a/include/boost/algorithm/find_not.hpp b/include/boost/algorithm/find_not.hpp index 4d8a28abf..cc9dc214f 100644 --- a/include/boost/algorithm/find_not.hpp +++ b/include/boost/algorithm/find_not.hpp @@ -7,13 +7,12 @@ #ifndef BOOST_ALGORITHM_FIND_NOT_HPP #define BOOST_ALGORITHM_FIND_NOT_HPP +#include + #include #include #include -#include - - namespace boost { namespace algorithm { template diff --git a/include/boost/algorithm/gather.hpp b/include/boost/algorithm/gather.hpp index 944bc9434..7a0fdf2f3 100644 --- a/include/boost/algorithm/gather.hpp +++ b/include/boost/algorithm/gather.hpp @@ -23,6 +23,7 @@ #include // for std::stable_partition #include +#include #include // for boost::bind #include // for boost::begin(range) #include // for boost::end(range) diff --git a/include/boost/algorithm/hex.hpp b/include/boost/algorithm/hex.hpp index b8335843a..446a5b12a 100644 --- a/include/boost/algorithm/hex.hpp +++ b/include/boost/algorithm/hex.hpp @@ -23,6 +23,7 @@ #include // for std::iterator_traits #include +#include #include #include #include diff --git a/include/boost/algorithm/is_palindrome.hpp b/include/boost/algorithm/is_palindrome.hpp index 09881109a..8e1df1811 100644 --- a/include/boost/algorithm/is_palindrome.hpp +++ b/include/boost/algorithm/is_palindrome.hpp @@ -19,6 +19,7 @@ #include #include +#include #include #include diff --git a/include/boost/algorithm/is_partitioned_until.hpp b/include/boost/algorithm/is_partitioned_until.hpp index 42683e1d8..bf3ac6722 100644 --- a/include/boost/algorithm/is_partitioned_until.hpp +++ b/include/boost/algorithm/is_partitioned_until.hpp @@ -12,6 +12,7 @@ #ifndef BOOST_ALGORITHM_IS_PARTITIONED_UNTIL_HPP #define BOOST_ALGORITHM_IS_PARTITIONED_UNTIL_HPP +#include #include #include diff --git a/include/boost/algorithm/minmax.hpp b/include/boost/algorithm/minmax.hpp index 053a7d60a..c1aadb290 100644 --- a/include/boost/algorithm/minmax.hpp +++ b/include/boost/algorithm/minmax.hpp @@ -25,6 +25,7 @@ * */ +#include #include // for using pairs with boost::cref #include diff --git a/include/boost/algorithm/minmax_element.hpp b/include/boost/algorithm/minmax_element.hpp index 752f6cbdb..651a552fe 100644 --- a/include/boost/algorithm/minmax_element.hpp +++ b/include/boost/algorithm/minmax_element.hpp @@ -28,6 +28,8 @@ #include // for std::pair and std::make_pair +#include + namespace boost { namespace detail { // for obtaining a uniform version of minmax_element diff --git a/include/boost/algorithm/searching/boyer_moore.hpp b/include/boost/algorithm/searching/boyer_moore.hpp index 192d4dec2..4bf76575e 100644 --- a/include/boost/algorithm/searching/boyer_moore.hpp +++ b/include/boost/algorithm/searching/boyer_moore.hpp @@ -12,6 +12,7 @@ #include // for std::iterator_traits +#include #include #include diff --git a/include/boost/algorithm/searching/boyer_moore_horspool.hpp b/include/boost/algorithm/searching/boyer_moore_horspool.hpp index aacb5cb83..dd354cc54 100644 --- a/include/boost/algorithm/searching/boyer_moore_horspool.hpp +++ b/include/boost/algorithm/searching/boyer_moore_horspool.hpp @@ -12,6 +12,7 @@ #include // for std::iterator_traits +#include #include #include diff --git a/include/boost/algorithm/searching/knuth_morris_pratt.hpp b/include/boost/algorithm/searching/knuth_morris_pratt.hpp index 5b5b64a72..7c1541cc4 100644 --- a/include/boost/algorithm/searching/knuth_morris_pratt.hpp +++ b/include/boost/algorithm/searching/knuth_morris_pratt.hpp @@ -13,6 +13,7 @@ #include #include // for std::iterator_traits +#include #include #include diff --git a/include/boost/algorithm/sort_subrange.hpp b/include/boost/algorithm/sort_subrange.hpp index 7fb2cb55d..700dd6dc8 100644 --- a/include/boost/algorithm/sort_subrange.hpp +++ b/include/boost/algorithm/sort_subrange.hpp @@ -22,6 +22,7 @@ #include // For std::iterator_traits #include // For nth_element and partial_sort +#include #include #include From a814721376b29cbb0ff0e5d9c8dac87d55195f31 Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Tue, 3 Dec 2019 08:39:34 -0800 Subject: [PATCH 09/63] Apply PR#57 from tonyelewis to improve the docs. Thanks, Tony\! --- doc/Jamfile.v2 | 5 +- doc/algorithm.qbk | 190 +++++++++++++++++++++++++++++++++++++- doc/apply_permutation.qbk | 2 +- 3 files changed, 191 insertions(+), 6 deletions(-) diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2 index 360b9732d..bc67f7def 100644 --- a/doc/Jamfile.v2 +++ b/doc/Jamfile.v2 @@ -22,6 +22,7 @@ doxygen autodoc ../../../boost/algorithm/searching/*.hpp ../../../boost/algorithm/cxx11/*.hpp ../../../boost/algorithm/cxx14/*.hpp + ../../../boost/algorithm/cxx17/*.hpp ] : "PREDEFINED=\"BOOST_ALGORITHM_DOXYGEN=1\"" @@ -40,8 +41,8 @@ boostbook standalone "boost.doxygen.reftitle=Boost.Algorithms C++ Reference" chapter.autolabel=0 chunk.section.depth=8 - toc.section.depth=2 - toc.max.depth=2 + toc.section.depth=3 + toc.max.depth=3 generate.section.toc.level=1 ; diff --git a/doc/algorithm.qbk b/doc/algorithm.qbk index 3d1230f11..64e8dfb70 100644 --- a/doc/algorithm.qbk +++ b/doc/algorithm.qbk @@ -46,7 +46,11 @@ Thanks to all the people who have reviewed this library and made suggestions for [include knuth_morris_pratt.qbk] [endsect] + [section:CXX11 C++11 Algorithms] + +[section:CXX11_inner_algorithms] + [include all_of.qbk] [include any_of.qbk] [include none_of.qbk] @@ -55,24 +59,204 @@ Thanks to all the people who have reviewed this library and made suggestions for [include is_partitioned.qbk] [include is_permutation.qbk] [include partition_point.qbk] -[endsect] + +[section:partition_copy partition_copy ] +[*[^[link header.boost.algorithm.cxx11.partition_copy_hpp partition_copy] ] ] +Copy a subset of a sequence to a new sequence +[endsect:partition_copy] + +[section:copy_if copy_if ] +[*[^[link header.boost.algorithm.cxx11.copy_if_hpp copy_if] ] ] +Copy a subset of a sequence to a new sequence +[endsect:copy_if] + +[section:copy_n copy_n ] +[*[^[link header.boost.algorithm.cxx11.copy_n_hpp copy_n] ] ] +Copy n items from one sequence to another +[endsect:copy_n] + +[section:iota iota ] +[*[^[link header.boost.algorithm.cxx11.iota_hpp iota] ] ] +Generate an increasing series +[endsect:iota] + +[endsect:CXX11_inner_algorithms] + +[endsect:CXX11] + [section:CXX14 C++14 Algorithms] + +[section:CXX14_inner_algorithms] + [include equal.qbk] [include mismatch.qbk] -[endsect] + +[endsect:CXX14_inner_algorithms] + +[endsect:CXX14] + + +[section:CXX17 C++17 Algorithms] + +[section:CXX17_inner_algorithms] + +[section:for_each_n for_each_n] +[*[^[link boost.algorithm.for_each_n for_each_n] ] ] +Apply a functor to the elements of a sequence +[endsect:for_each_n] + +[endsect:CXX17_inner_algorithms] + +[endsect:CXX17] + [section:Misc Other Algorithms] + +[section:misc_inner_algorithms] + +[section:none_of_equal none_of_equal ] +[*[^[link header.boost.algorithm.cxx11.none_of_hpp none_of_equal] ] ] +Whether none of a range's elements matches a value +[endsect:none_of_equal] + +[section:one_of_equal one_of_equal ] +[*[^[link header.boost.algorithm.cxx11.one_of_hpp one_of_equal] ] ] +Whether only one of a range's elements matches a value +[endsect:one_of_equal] + +[section:is_decreasing is_decreasing ] +[*[^[link header.boost.algorithm.cxx11.is_sorted_hpp is_decreasing] ] ] +Whether an entire sequence is decreasing; i.e, each item is less than or equal to the previous one +[endsect:is_decreasing] + +[section:is_increasing is_increasing ] +[*[^[link header.boost.algorithm.cxx11.is_sorted_hpp is_increasing] ] ] +Whether an entire sequence is increasing; i.e, each item is greater than or equal to the previous one +[endsect:is_increasing] + +[section:is_strictly_decreasing is_strictly_decreasing ] +[*[^[link header.boost.algorithm.cxx11.is_sorted_hpp is_strictly_decreasing] ] ] +Whether an entire sequence is strictly decreasing; i.e, each item is less than the previous one +[endsect:is_strictly_decreasing] + +[section:is_strictly_increasing is_strictly_increasing ] +[*[^[link header.boost.algorithm.cxx11.is_sorted_hpp is_strictly_increasing] ] ] +Whether an entire sequence is strictly increasing; i.e, each item is greater than the previous one +[endsect:is_strictly_increasing] + [include clamp-hpp.qbk] + +[section:clamp_range clamp_range ] +[*[^[link header.boost.algorithm.clamp_hpp clamp_range] ] ] +Perform [^clamp] on the elements of a range and write the results into an output iterator +[endsect:clamp_range] + [include find_not.qbk] + [include find_backward.qbk] + +[section:find_not_backward find_not_backward ] +[*[^[link header.boost.algorithm.find_backward_hpp find_not_backward] ] ] +Find the last element in a sequence that does not equal a value. +See [link the_boost_algorithm_library.Misc.misc_inner_algorithms.find_backward find_backward]. +[endsect:find_not_backward] + +[section:find_if_backward find_if_backward ] +[*[^[link header.boost.algorithm.find_backward_hpp find_if_backward] ] ] +Find the last element in a sequence that satisfies a predicate. +See [link the_boost_algorithm_library.Misc.misc_inner_algorithms.find_backward find_backward]. +[endsect:find_if_backward] + +[section:find_if_not find_if_not ] +[*[^[link header.boost.algorithm.cxx11.find_if_not_hpp find_if_not] ] ] +Find the first element in a sequence that does not satisfy a predicate. +See [link the_boost_algorithm_library.Misc.misc_inner_algorithms.find_not find_not]. +[endsect:find_if_not] + +[section:find_if_not_backward find_if_not_backward ] +[*[^[link header.boost.algorithm.find_backward_hpp find_if_not_backward] ] ] +Find the last element in a sequence that does not satisfy a predicate. +See [link the_boost_algorithm_library.Misc.misc_inner_algorithms.find_backward find_backward]. +[endsect:find_if_not_backward] + [include gather.qbk] + [include hex.qbk] + +[section:unhex unhex ] +[*[^[link header.boost.algorithm.hex_hpp unhex] ] ] +Convert a sequence of hexadecimal characters into a sequence of integers or characters +[endsect:unhex] + +[section:hex_lower hex_lower ] +[*[^[link header.boost.algorithm.hex_hpp hex_lower] ] ] +Convert a sequence of integral types into a lower case hexadecimal sequence of characters +[endsect:hex_lower] + [include is_palindrome.qbk] + [include is_partitioned_until.qbk] + +[section:apply_reverse_permutation apply_reverse_permutation ] +See below +[endsect:apply_reverse_permutation] + [include apply_permutation.qbk] -[endsect] +[section:copy_until copy_until ] +[*[^[link header.boost.algorithm.cxx11.copy_if_hpp copy_until] ] ] +Copy all the elements at the start of the input range that do not satisfy the predicate to the output range +[endsect:copy_until] + +[section:copy_while copy_while ] +[*[^[link header.boost.algorithm.cxx11.copy_if_hpp copy_while] ] ] +Copy all the elements at the start of the input range that satisfy the predicate to the output range +[endsect:copy_while] + +[section:iota_n iota_n ] +[*[^[link boost.algorithm.iota_n iota_n] ] ] +Write a sequence of n increasing values to an output iterator +[endsect:iota_n] + +[section:power power ] +[*[^[link header.boost.algorithm.algorithm_hpp power] ] ] +Raise a value to an integral power ([^constexpr] since C++14) +[endsect:power] + +[endsect:misc_inner_algorithms] + +[endsect:Misc] + + +[section:not_yet_documented_cxx17_algos Not-yet-documented C++17 Algorithms] + +* [*[^[link header.boost.algorithm.cxx17.exclusive_scan_hpp exclusive_scan] ] ] +* [*[^[link header.boost.algorithm.cxx17.inclusive_scan_hpp inclusive_scan] ] ] +* [*[^[link header.boost.algorithm.cxx17.reduce_hpp reduce] ] ] +* [*[^[link header.boost.algorithm.cxx17.transform_exclusive_scan_hpp transform_exclusive_scan] ] ] +* [*[^[link header.boost.algorithm.cxx17.transform_inclusive_scan_hpp transform_inclusive_scan] ] ] +* [*[^[link header.boost.algorithm.cxx17.transform_reduce_hpp transform_reduce] ] ] + +[endsect:not_yet_documented_cxx17_algos] + + +[section:not_yet_documented_other_algos Not-yet-documented Other Algorithms] + +* [*[^[link header.boost.algorithm.minmax_hpp minmax] ] ] +* [*[^[link header.boost.algorithm.minmax_element_hpp first_max_element] ] ] +* [*[^[link header.boost.algorithm.minmax_element_hpp first_min_element] ] ] +* [*[^[link header.boost.algorithm.minmax_element_hpp first_min_first_max_element] ] ] +* [*[^[link header.boost.algorithm.minmax_element_hpp first_min_last_max_element] ] ] +* [*[^[link header.boost.algorithm.minmax_element_hpp last_max_element] ] ] +* [*[^[link header.boost.algorithm.minmax_element_hpp last_min_element] ] ] +* [*[^[link header.boost.algorithm.minmax_element_hpp last_min_first_max_element] ] ] +* [*[^[link header.boost.algorithm.minmax_element_hpp last_min_last_max_element] ] ] +* [*[^[link header.boost.algorithm.minmax_element_hpp minmax_element] ] ] +* [*[^[link header.boost.algorithm.sort_subrange_hpp partition_subrange] ] ] +* [*[^[link header.boost.algorithm.sort_subrange_hpp sort_subrange] ] ] + +[endsect:not_yet_documented_other_algos] [xinclude autodoc.xml] diff --git a/doc/apply_permutation.qbk b/doc/apply_permutation.qbk index 7f11457d4..86bebf1e9 100644 --- a/doc/apply_permutation.qbk +++ b/doc/apply_permutation.qbk @@ -9,7 +9,7 @@ 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) ] -The header file 'apply_permutation.hpp' contains two algorithms, apply_permutation and apply_reverse_permutation. Also there are range-based versions. +The header file [^[link header.boost.algorithm.apply_permutation_hpp apply_permutation.hpp]] contains two algorithms, `apply_permutation` and `apply_reverse_permutation`. There are also range-based versions. The algorithms transform the item sequence according to index sequence order. The routine `apply_permutation` takes a item sequence and a order sequence. It reshuffles item sequence according to order sequence. Every value in order sequence means where the item comes from. Order sequence needs to be exactly a permutation of the sequence [0, 1, ... , N], where N is the biggest index in the item sequence (zero-indexed). From 8e23ffde9e34d7d95d0c647a2c15c8573b6c3c2f Mon Sep 17 00:00:00 2001 From: Edward Diener Date: Mon, 30 Mar 2020 18:47:19 -0400 Subject: [PATCH 10/63] Change __BORLANDC__ to BOOST_BORLANDC, which is defined in Boost config for the Embarcadero non-clang-based compilers. --- include/boost/algorithm/string/compare.hpp | 6 +++--- include/boost/algorithm/string/detail/case_conv.hpp | 4 ++-- include/boost/algorithm/string/detail/classification.hpp | 2 +- include/boost/algorithm/string/detail/formatter.hpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/boost/algorithm/string/compare.hpp b/include/boost/algorithm/string/compare.hpp index 734303a9a..dc34007cf 100644 --- a/include/boost/algorithm/string/compare.hpp +++ b/include/boost/algorithm/string/compare.hpp @@ -65,7 +65,7 @@ namespace boost { template< typename T1, typename T2 > bool operator()( const T1& Arg1, const T2& Arg2 ) const { - #if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x564) && !defined(_USE_OLD_RW_STL) + #if defined(BOOST_BORLANDC) && (BOOST_BORLANDC >= 0x560) && (BOOST_BORLANDC <= 0x564) && !defined(_USE_OLD_RW_STL) return std::toupper(Arg1)==std::toupper(Arg2); #else return std::toupper(Arg1,m_Loc)==std::toupper(Arg2,m_Loc); @@ -118,7 +118,7 @@ namespace boost { template< typename T1, typename T2 > bool operator()( const T1& Arg1, const T2& Arg2 ) const { - #if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x564) && !defined(_USE_OLD_RW_STL) + #if defined(BOOST_BORLANDC) && (BOOST_BORLANDC >= 0x560) && (BOOST_BORLANDC <= 0x564) && !defined(_USE_OLD_RW_STL) return std::toupper(Arg1)(Arg1,m_Loc)(Arg2,m_Loc); @@ -171,7 +171,7 @@ namespace boost { template< typename T1, typename T2 > bool operator()( const T1& Arg1, const T2& Arg2 ) const { - #if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x564) && !defined(_USE_OLD_RW_STL) + #if defined(BOOST_BORLANDC) && (BOOST_BORLANDC >= 0x560) && (BOOST_BORLANDC <= 0x564) && !defined(_USE_OLD_RW_STL) return std::toupper(Arg1)<=std::toupper(Arg2); #else return std::toupper(Arg1,m_Loc)<=std::toupper(Arg2,m_Loc); diff --git a/include/boost/algorithm/string/detail/case_conv.hpp b/include/boost/algorithm/string/detail/case_conv.hpp index 233912ca0..3ba317f41 100644 --- a/include/boost/algorithm/string/detail/case_conv.hpp +++ b/include/boost/algorithm/string/detail/case_conv.hpp @@ -40,7 +40,7 @@ namespace boost { // Operation CharT operator ()( CharT Ch ) const { - #if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x564) && !defined(_USE_OLD_RW_STL) + #if defined(BOOST_BORLANDC) && (BOOST_BORLANDC >= 0x560) && (BOOST_BORLANDC <= 0x564) && !defined(_USE_OLD_RW_STL) return std::tolower( static_cast::type> ( Ch )); #else return std::tolower( Ch, *m_Loc ); @@ -62,7 +62,7 @@ namespace boost { // Operation CharT operator ()( CharT Ch ) const { - #if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x564) && !defined(_USE_OLD_RW_STL) + #if defined(BOOST_BORLANDC) && (BOOST_BORLANDC >= 0x560) && (BOOST_BORLANDC <= 0x564) && !defined(_USE_OLD_RW_STL) return std::toupper( static_cast::type> ( Ch )); #else return std::toupper( Ch, *m_Loc ); diff --git a/include/boost/algorithm/string/detail/classification.hpp b/include/boost/algorithm/string/detail/classification.hpp index 704d9d20f..febf8b7b5 100644 --- a/include/boost/algorithm/string/detail/classification.hpp +++ b/include/boost/algorithm/string/detail/classification.hpp @@ -45,7 +45,7 @@ namespace boost { return std::use_facet< std::ctype >(m_Locale).is( m_Type, Ch ); } - #if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x582) && !defined(_USE_OLD_RW_STL) + #if defined(BOOST_BORLANDC) && (BOOST_BORLANDC >= 0x560) && (BOOST_BORLANDC <= 0x582) && !defined(_USE_OLD_RW_STL) template<> bool operator()( char const Ch ) const { diff --git a/include/boost/algorithm/string/detail/formatter.hpp b/include/boost/algorithm/string/detail/formatter.hpp index c071822f2..f4c6728b3 100644 --- a/include/boost/algorithm/string/detail/formatter.hpp +++ b/include/boost/algorithm/string/detail/formatter.hpp @@ -42,7 +42,7 @@ namespace boost { m_Format(::boost::begin(Format), ::boost::end(Format)) {} // Operation -#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) +#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564)) template result_type& operator()(const Range2T&) { From 6d86fb3aaa96b3639f5c65f7cbf28afa66cba81a Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Tue, 28 Apr 2020 12:41:10 -0700 Subject: [PATCH 11/63] Change include of boost/bind.hpp -> boost/bind/bind.hpp. Thanks to Andrey for the suggested patch --- include/boost/algorithm/gather.hpp | 8 +++++--- string/example/predicate_example.cpp | 2 -- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/boost/algorithm/gather.hpp b/include/boost/algorithm/gather.hpp index 7a0fdf2f3..e777f8bd1 100644 --- a/include/boost/algorithm/gather.hpp +++ b/include/boost/algorithm/gather.hpp @@ -22,9 +22,10 @@ #include // for std::stable_partition #include +#include // for std::make_pair #include -#include // for boost::bind +#include // for boost::bind #include // for boost::begin(range) #include // for boost::end(range) @@ -81,13 +82,14 @@ namespace boost { namespace algorithm { */ template < - typename BidirectionalIterator, // Iter models BidirectionalIterator - typename Pred> // Pred models UnaryPredicate + typename BidirectionalIterator, // models BidirectionalIterator + typename Pred> // models UnaryPredicate std::pair gather ( BidirectionalIterator first, BidirectionalIterator last, BidirectionalIterator pivot, Pred pred ) { // The first call partitions everything up to (but not including) the pivot element, // while the second call partitions the rest of the sequence. + using namespace boost::placeholders; return std::make_pair ( std::stable_partition ( first, pivot, !boost::bind ( pred, _1 )), std::stable_partition ( pivot, last, boost::bind ( pred, _1 ))); diff --git a/string/example/predicate_example.cpp b/string/example/predicate_example.cpp index 473ab8b57..26d24e470 100644 --- a/string/example/predicate_example.cpp +++ b/string/example/predicate_example.cpp @@ -12,8 +12,6 @@ #include #include #include -#include - using namespace std; using namespace boost; From ed4033f0ccf859baf37db544996bd31a3056a374 Mon Sep 17 00:00:00 2001 From: Andrey Semashev Date: Mon, 11 May 2020 17:21:24 +0300 Subject: [PATCH 12/63] Avoid using deprecated header boost/detail/iterator.hpp. This header is deprecated in favor of and will be removed in a future release. This silences deprecation warnings. --- include/boost/algorithm/string/detail/finder.hpp | 14 +++++++------- include/boost/algorithm/string/detail/trim.hpp | 6 +++--- include/boost/algorithm/string/predicate.hpp | 7 ++++--- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/include/boost/algorithm/string/detail/finder.hpp b/include/boost/algorithm/string/detail/finder.hpp index a2a958212..112fde9b8 100644 --- a/include/boost/algorithm/string/detail/finder.hpp +++ b/include/boost/algorithm/string/detail/finder.hpp @@ -13,7 +13,7 @@ #include #include -#include +#include #include #include @@ -127,8 +127,8 @@ namespace boost { if( boost::empty(m_Search) ) return result_type( End, End ); - typedef BOOST_STRING_TYPENAME boost::detail:: - iterator_traits::iterator_category category; + typedef BOOST_STRING_TYPENAME + std::iterator_traits::iterator_category category; return findit( Begin, End, category() ); } @@ -375,8 +375,8 @@ namespace boost { ForwardIteratorT End, unsigned int N ) { - typedef BOOST_STRING_TYPENAME boost::detail:: - iterator_traits::iterator_category category; + typedef BOOST_STRING_TYPENAME + std::iterator_traits::iterator_category category; return ::boost::algorithm::detail::find_head_impl( Begin, End, N, category() ); } @@ -448,8 +448,8 @@ namespace boost { ForwardIteratorT End, unsigned int N ) { - typedef BOOST_STRING_TYPENAME boost::detail:: - iterator_traits::iterator_category category; + typedef BOOST_STRING_TYPENAME + std::iterator_traits::iterator_category category; return ::boost::algorithm::detail::find_tail_impl( Begin, End, N, category() ); } diff --git a/include/boost/algorithm/string/detail/trim.hpp b/include/boost/algorithm/string/detail/trim.hpp index 1233e49d3..3bb4ef203 100644 --- a/include/boost/algorithm/string/detail/trim.hpp +++ b/include/boost/algorithm/string/detail/trim.hpp @@ -12,7 +12,7 @@ #define BOOST_STRING_TRIM_DETAIL_HPP #include -#include +#include namespace boost { namespace algorithm { @@ -80,8 +80,8 @@ namespace boost { ForwardIteratorT InEnd, PredicateT IsSpace ) { - typedef BOOST_STRING_TYPENAME boost::detail:: - iterator_traits::iterator_category category; + typedef BOOST_STRING_TYPENAME + std::iterator_traits::iterator_category category; return ::boost::algorithm::detail::trim_end_iter_select( InBegin, InEnd, IsSpace, category() ); } diff --git a/include/boost/algorithm/string/predicate.hpp b/include/boost/algorithm/string/predicate.hpp index 0879829b5..d7c86e8a5 100644 --- a/include/boost/algorithm/string/predicate.hpp +++ b/include/boost/algorithm/string/predicate.hpp @@ -11,6 +11,7 @@ #ifndef BOOST_STRING_PREDICATE_HPP #define BOOST_STRING_PREDICATE_HPP +#include #include #include #include @@ -144,10 +145,10 @@ namespace boost { iterator_range::type> lit_input(::boost::as_literal(Input)); iterator_range::type> lit_test(::boost::as_literal(Test)); - typedef BOOST_STRING_TYPENAME + typedef BOOST_STRING_TYPENAME range_const_iterator::type Iterator1T; - typedef BOOST_STRING_TYPENAME boost::detail:: - iterator_traits::iterator_category category; + typedef BOOST_STRING_TYPENAME + std::iterator_traits::iterator_category category; return detail:: ends_with_iter_select( From 8710bbd4b698c331725dee6dccc6fdedcc0e5e85 Mon Sep 17 00:00:00 2001 From: Andrey Semashev Date: Mon, 11 May 2020 18:42:15 +0300 Subject: [PATCH 13/63] Remove a few leftover uses of boost/detail/iterator.hpp. --- include/boost/algorithm/string/find_format.hpp | 3 +-- include/boost/algorithm/string/formatter.hpp | 1 - string/example/rle_example.cpp | 10 +++++----- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/include/boost/algorithm/string/find_format.hpp b/include/boost/algorithm/string/find_format.hpp index 0e84a4ee6..4d9315cb1 100644 --- a/include/boost/algorithm/string/find_format.hpp +++ b/include/boost/algorithm/string/find_format.hpp @@ -12,7 +12,6 @@ #define BOOST_STRING_FIND_FORMAT_HPP #include -#include #include #include #include @@ -40,7 +39,7 @@ namespace boost { this substring and replace it in the input. The result is a modified copy of the input. It is returned as a sequence or copied to the output iterator. - + \param Output An output iterator to which the result will be copied \param Input An input sequence \param Finder A Finder object used to search for a match to be replaced diff --git a/include/boost/algorithm/string/formatter.hpp b/include/boost/algorithm/string/formatter.hpp index de8681bc3..0e08ae7b3 100644 --- a/include/boost/algorithm/string/formatter.hpp +++ b/include/boost/algorithm/string/formatter.hpp @@ -11,7 +11,6 @@ #ifndef BOOST_STRING_FORMATTER_HPP #define BOOST_STRING_FORMATTER_HPP -#include #include #include #include diff --git a/string/example/rle_example.cpp b/string/example/rle_example.cpp index 9e52b96b3..ff47ccca4 100644 --- a/string/example/rle_example.cpp +++ b/string/example/rle_example.cpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include @@ -46,7 +46,7 @@ struct find_compressF ForwardIteratorT End ) const { typedef ForwardIteratorT input_iterator_type; - typedef typename boost::detail::iterator_traits::value_type value_type; + typedef typename std::iterator_traits::value_type value_type; typedef iterator_range result_type; // begin of the matching segment @@ -144,7 +144,7 @@ struct find_decompressF ForwardIteratorT End ) const { typedef ForwardIteratorT input_iterator_type; - typedef typename boost::detail::iterator_traits::value_type value_type; + typedef typename std::iterator_traits::value_type value_type; typedef iterator_range result_type; for(input_iterator_type It=Begin; It!=End; It++) @@ -153,12 +153,12 @@ struct find_decompressF { // Repeat mark found, extract body input_iterator_type It2=It++; - + if ( It==End ) break; It++; if ( It==End ) break; It++; - + return result_type( It2, It ); } } From 130e4da8cba8b3c980cdd52265bc49fbf436f513 Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Thu, 28 May 2020 22:05:47 -0700 Subject: [PATCH 14/63] Remove empty loop bodies to prevent clang 'extra-semi-stmt warnings'. Thanks to Eugene for the heads-up --- include/boost/algorithm/string/detail/finder.hpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/boost/algorithm/string/detail/finder.hpp b/include/boost/algorithm/string/detail/finder.hpp index 112fde9b8..8e70240de 100644 --- a/include/boost/algorithm/string/detail/finder.hpp +++ b/include/boost/algorithm/string/detail/finder.hpp @@ -344,9 +344,8 @@ namespace boost { typedef iterator_range result_type; input_iterator_type It=Begin; - for( - unsigned int Index=0; - Index result_type; input_iterator_type It=End; - for( - unsigned int Index=0; - Index Date: Fri, 17 Jul 2020 01:52:08 +0300 Subject: [PATCH 15/63] Add missing include This patch allows the header to be built standalone, as part of clang C++ modules builds. --- include/boost/algorithm/string/detail/find_format_all.hpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/boost/algorithm/string/detail/find_format_all.hpp b/include/boost/algorithm/string/detail/find_format_all.hpp index 52930c83a..311fa26ff 100644 --- a/include/boost/algorithm/string/detail/find_format_all.hpp +++ b/include/boost/algorithm/string/detail/find_format_all.hpp @@ -18,6 +18,8 @@ #include #include +#include + namespace boost { namespace algorithm { namespace detail { From 68100d9198ef1ba978523a79aca92917b31dd832 Mon Sep 17 00:00:00 2001 From: Vassil Vassilev Date: Fri, 17 Jul 2020 08:16:46 +0300 Subject: [PATCH 16/63] Add missing includes This patch allows the header to be built standalone, as part of clang C++ modules builds. --- include/boost/algorithm/string/detail/case_conv.hpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/boost/algorithm/string/detail/case_conv.hpp b/include/boost/algorithm/string/detail/case_conv.hpp index 3ba317f41..188602a1d 100644 --- a/include/boost/algorithm/string/detail/case_conv.hpp +++ b/include/boost/algorithm/string/detail/case_conv.hpp @@ -15,6 +15,9 @@ #include #include +#include +#include +#include #include namespace boost { From 49d284392c0f5144b6d744f98d7369a1266e741a Mon Sep 17 00:00:00 2001 From: Vassil Vassilev Date: Fri, 17 Jul 2020 11:06:33 +0300 Subject: [PATCH 17/63] Add missing include This patch allows the header to be built standalone, as part of clang C++ modules builds --- include/boost/algorithm/string/detail/classification.hpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/boost/algorithm/string/detail/classification.hpp b/include/boost/algorithm/string/detail/classification.hpp index febf8b7b5..30a37c698 100644 --- a/include/boost/algorithm/string/detail/classification.hpp +++ b/include/boost/algorithm/string/detail/classification.hpp @@ -13,10 +13,12 @@ #include #include +#include #include #include #include +#include #include #include From c16b8ffaddb6a34ae73491f600f542ac78d64df7 Mon Sep 17 00:00:00 2001 From: Giovanni Cerretani Date: Fri, 23 Oct 2020 15:27:49 +0200 Subject: [PATCH 18/63] Update usage.xml Doc typo. --- string/doc/usage.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/string/doc/usage.xml b/string/doc/usage.xml index 56fd3acd7..174d17739 100644 --- a/string/doc/usage.xml +++ b/string/doc/usage.xml @@ -265,7 +265,7 @@ Find Iterator - 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 Finder to incrementally search the string. From 8c26a50a12f9e312420af99d55fc09324178ffd5 Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Thu, 12 Nov 2020 08:32:46 -0800 Subject: [PATCH 19/63] Fix incorrect include guards (copypasta). Thanks to Anton Vasin (tony-space) for the bug report and fix --- include/boost/algorithm/cxx17/inclusive_scan.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/boost/algorithm/cxx17/inclusive_scan.hpp b/include/boost/algorithm/cxx17/inclusive_scan.hpp index 57812670a..fcc9bc2da 100644 --- a/include/boost/algorithm/cxx17/inclusive_scan.hpp +++ b/include/boost/algorithm/cxx17/inclusive_scan.hpp @@ -9,8 +9,8 @@ /// \brief Combine the (transformed) elements of a sequence (or two) into a single value. /// \author Marshall Clow -#ifndef BOOST_ALGORITHM_TRANSFORM_REDUCE_HPP -#define BOOST_ALGORITHM_TRANSFORM_REDUCE_HPP +#ifndef BOOST_ALGORITHM_INCLUSIVE_SCAN_HPP +#define BOOST_ALGORITHM_INCLUSIVE_SCAN_HPP #include // for std::plus #include // for std::iterator_traits @@ -58,4 +58,4 @@ OutputIterator inclusive_scan(InputIterator first, InputIterator last, }} // namespace boost and algorithm -#endif // BOOST_ALGORITHM_TRANSFORM_REDUCE_HPP +#endif // BOOST_ALGORITHM_INCLUSIVE_SCAN_HPP From fc86cd34f75293c265ecf73c1890e12749de6d70 Mon Sep 17 00:00:00 2001 From: Edward Diener Date: Wed, 18 Nov 2020 12:46:50 -0500 Subject: [PATCH 20/63] Remove erroneous inclusion of C++11 type_traits header file. --- include/boost/algorithm/apply_permutation.hpp | 1 - 1 file changed, 1 deletion(-) diff --git a/include/boost/algorithm/apply_permutation.hpp b/include/boost/algorithm/apply_permutation.hpp index 225ae5783..124c31efe 100644 --- a/include/boost/algorithm/apply_permutation.hpp +++ b/include/boost/algorithm/apply_permutation.hpp @@ -19,7 +19,6 @@ #define BOOST_ALGORITHM_APPLY_PERMUTATION_HPP #include -#include #include #include From 137c92dac085e8196c5530dff408cb398b4b4649 Mon Sep 17 00:00:00 2001 From: Edward Diener Date: Mon, 18 Jan 2021 20:32:12 -0500 Subject: [PATCH 21/63] [skip ci] Add "cxxstd" json field. The "cxxstd" json field is being added to each Boost library's meta json information for libraries in order to specify the minumum C++ standard compilation level. The value of this field matches one of the values for 'cxxstd' in Boost.Build. The purpose of doing this is to provide information for the Boost website documentation for each library which will specify the minimum C++ standard compilation that an end-user must employ in order to use the particular library. This will aid end-users who want to know if they can successfully use a Boost library based on their C++ compiler's compilation level, without having to search the library's documentation to find this out. --- meta/libraries.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/meta/libraries.json b/meta/libraries.json index 43304e2e5..de11d6523 100644 --- a/meta/libraries.json +++ b/meta/libraries.json @@ -11,7 +11,8 @@ ], "maintainers": [ "Marshall Clow " - ] + ], + "cxxstd": "03" }, { "key": "algorithm/minmax", @@ -26,7 +27,8 @@ ], "maintainers": [ "Marshall Clow " - ] + ], + "cxxstd": "03" }, { "key": "algorithm/string", @@ -42,6 +44,7 @@ ], "maintainers": [ "Marshall Clow " - ] + ], + "cxxstd": "03" } ] \ No newline at end of file From c9077bd49580bddfaa8a5c71abc4022a2b09d972 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Thu, 18 Mar 2021 17:32:16 +0200 Subject: [PATCH 22/63] Add CMakeLists.txt --- CMakeLists.txt | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 000000000..806b689ee --- /dev/null +++ b/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() + From 4ad181f464ddaaad63e65e81a47c57b301daac33 Mon Sep 17 00:00:00 2001 From: Ivan Matek Date: Sat, 31 Jul 2021 21:20:56 +0200 Subject: [PATCH 23/63] Add is_clamped.hpp, is_clamped_test.cpp --- include/boost/algorithm/is_clamped.hpp | 73 ++++++++ test/Jamfile.v2 | 1 + test/is_clamped_test.cpp | 224 +++++++++++++++++++++++++ 3 files changed, 298 insertions(+) create mode 100644 include/boost/algorithm/is_clamped.hpp create mode 100644 test/is_clamped_test.cpp diff --git a/include/boost/algorithm/is_clamped.hpp b/include/boost/algorithm/is_clamped.hpp new file mode 100644 index 000000000..a736fba32 --- /dev/null +++ b/include/boost/algorithm/is_clamped.hpp @@ -0,0 +1,73 @@ +/* + Copyright (c) Marshall Clow 2008-2012. + + 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) + +*/ + +/// \file is_clamped.hpp +/// \brief IsClamped algorithm +/// \author TODO +/// + +#ifndef BOOST_ALGORITHM_IS_CLAMPED_HPP +#define BOOST_ALGORITHM_IS_CLAMPED_HPP + +#include // For std::less +#include // For std::iterator_traits +#include + +#include // for identity + +namespace boost { namespace algorithm { + +/// \fn is_clamped ( T const& val, +/// typename boost::mpl::identity::type const & lo, +/// typename boost::mpl::identity::type const & hi, Pred p ) +/// \returns true if value "val" is in the range [ lo, hi ] +/// using the comparison predicate p. +/// If p ( val, lo ) return false. +/// If p ( hi, val ) return false. +/// Otherwise, returns true. +/// +/// \param val The value to be checked +/// \param lo The lower bound of the range +/// \param hi The upper bound of the range +/// \param p A predicate to use to compare the values. +/// p ( a, b ) returns a boolean. +/// + template + BOOST_CXX14_CONSTEXPR bool is_clamped( + T const& val, typename boost::mpl::identity::type const& lo, + typename boost::mpl::identity::type const& hi, Pred p) { + // assert ( !p ( hi, lo )); // Can't assert p ( lo, hi ) b/c they + // might be equal + return p(val, lo) ? false : p(hi, val) ? false : true; + } + +/// \fn is_clamped ( T const& val, +/// typename boost::mpl::identity::type const & lo, +/// typename boost::mpl::identity::type const & hi) +/// \returns true if value "val" is in the range [ lo, hi ] +/// using operator < for comparison. +/// If the value is less than lo, return false. +/// If the value is greater than "hi", return false. +/// Otherwise, returns true. +/// +/// \param val The value to be checked +/// \param lo The lower bound of the range +/// \param hi The upper bound of the range +/// + + template + BOOST_CXX14_CONSTEXPR bool is_clamped ( const T& val, + typename boost::mpl::identity::type const & lo, + typename boost::mpl::identity::type const & hi ) + { + return boost::algorithm::is_clamped ( val, lo, hi, std::less()); + } + +}} + +#endif // BOOST_ALGORITHM_CLAMP_HPP diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index e7091e05e..5f5e73cc8 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -29,6 +29,7 @@ alias unit_test_framework # Misc tests [ run clamp_test.cpp unit_test_framework : : : : clamp_test ] + [ run is_clamped_test.cpp unit_test_framework : : : : is_clamped_test ] [ run power_test.cpp unit_test_framework : : : : power_test ] [ compile-fail power_fail1.cpp : : : : ] diff --git a/test/is_clamped_test.cpp b/test/is_clamped_test.cpp new file mode 100644 index 000000000..d5ea2b1dc --- /dev/null +++ b/test/is_clamped_test.cpp @@ -0,0 +1,224 @@ +// (C) Copyright TODO +// Use, modification and distribution are subject to 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) + +#include +#include +#include +#include +#ifdef __cpp_impl_three_way_comparison +#include +#endif +#include +#include +#include + +#define BOOST_TEST_MAIN +#include + +namespace ba = boost::algorithm; + +BOOST_CONSTEXPR bool intGreater(int lhs, int rhs) { return lhs > rhs; } + +class custom { + public: + custom(int x) : v(x) {} + custom(const custom &rhs) : v(rhs.v) {} + + bool operator<(const custom &rhs) const { return v < rhs.v; } + bool operator==(const custom &rhs) const { + return v == rhs.v; + } // need this for the test + int v; +}; + +static bool customLess(const custom &lhs, const custom &rhs) { return lhs.v < rhs.v; } + +void test_ints() { + // Inside the range, equal to the endpoints, and outside the endpoints. + BOOST_CHECK_EQUAL ( true, ba::is_clamped ( 3, 1, 6 )); + BOOST_CHECK_EQUAL ( true, ba::is_clamped ( 1, 1, 6 )); + BOOST_CHECK_EQUAL ( true, ba::is_clamped ( 6, 1, 6 )); + BOOST_CHECK_EQUAL ( false, ba::is_clamped ( 0, 1, 6 )); + BOOST_CHECK_EQUAL ( false, ba::is_clamped ( 7, 1, 6 )); + + BOOST_CHECK_EQUAL ( true, ba::is_clamped ( 3, 6, 1, intGreater )); + BOOST_CHECK_EQUAL ( true, ba::is_clamped ( 1, 6, 1, intGreater )); + BOOST_CHECK_EQUAL ( true, ba::is_clamped ( 6, 6, 1, intGreater )); + BOOST_CHECK_EQUAL ( false, ba::is_clamped ( 0, 6, 1, intGreater )); + BOOST_CHECK_EQUAL ( false, ba::is_clamped ( 7, 6, 1, intGreater )); + + // Negative numbers + BOOST_CHECK_EQUAL ( true, ba::is_clamped ( -3, -6, -1 )); + BOOST_CHECK_EQUAL ( true, ba::is_clamped ( -1, -6, -1 )); + BOOST_CHECK_EQUAL ( true, ba::is_clamped ( -6, -6, -1 )); + BOOST_CHECK_EQUAL ( false, ba::is_clamped ( 0, -6, -1 )); + BOOST_CHECK_EQUAL ( false, ba::is_clamped ( -7, -6, -1 )); + + // Mixed positive and negative numbers + BOOST_CHECK_EQUAL ( true, ba::is_clamped ( 1, -5, 5 )); + BOOST_CHECK_EQUAL ( true, ba::is_clamped ( -5, -5, 5 )); + BOOST_CHECK_EQUAL ( true, ba::is_clamped ( 5, -5, 5 )); + BOOST_CHECK_EQUAL ( false, ba::is_clamped ( -6, -5, 5 )); + BOOST_CHECK_EQUAL ( false, ba::is_clamped ( 6, -5, 5 )); + + // Unsigned + BOOST_CHECK_EQUAL ( true, ba::is_clamped ( 5U, 1U, 6U )); + BOOST_CHECK_EQUAL ( true, ba::is_clamped ( 1U, 1U, 6U )); + BOOST_CHECK_EQUAL ( true, ba::is_clamped ( 6U, 1U, 6U )); + BOOST_CHECK_EQUAL ( false, ba::is_clamped ( 0U, 1U, 6U )); + BOOST_CHECK_EQUAL ( false, ba::is_clamped ( 8U, 1U, 6U )); + + // Mixed (1) + BOOST_CHECK_EQUAL ( true, ba::is_clamped ( 5U, 1, 6 )); + BOOST_CHECK_EQUAL ( true, ba::is_clamped ( 1U, 1, 6 )); + BOOST_CHECK_EQUAL ( true, ba::is_clamped ( 6U, 1, 6 )); + BOOST_CHECK_EQUAL ( false, ba::is_clamped ( 0U, 1, 6 )); + BOOST_CHECK_EQUAL ( false, ba::is_clamped ( 8U, 1, 6 )); + + // Mixed (2) + BOOST_CHECK_EQUAL ( true, ba::is_clamped ( 5U, 1, 6. )); + BOOST_CHECK_EQUAL ( true, ba::is_clamped ( 1U, 1, 6. )); + BOOST_CHECK_EQUAL ( true, ba::is_clamped ( 6U, 1, 6. )); + BOOST_CHECK_EQUAL ( false, ba::is_clamped ( 0U, 1, 6. )); + BOOST_CHECK_EQUAL ( false, ba::is_clamped ( 8U, 1, 6. )); + + short foo = 50; + // float->short conversion does not round + BOOST_CHECK_EQUAL ( true, ba::is_clamped ( foo, 50.999, 100 )); + BOOST_CHECK_EQUAL ( false, ba::is_clamped ( foo, 51.001, 100 )); +} +void test_floats() { + // If floats are IEEE754 certain floats have exact representations. + if (std::numeric_limits::is_iec559) { + const float lo = 0.125; + const float hi = 0.625; + BOOST_CHECK_EQUAL ( true, ba::is_clamped ( lo, lo, hi )); + BOOST_CHECK_EQUAL ( true, ba::is_clamped ( hi, lo, hi )); + BOOST_CHECK_EQUAL ( true, ba::is_clamped ( lo + 0.01, lo, hi )); + BOOST_CHECK_EQUAL ( false, ba::is_clamped ( lo - 0.01, lo, hi )); + BOOST_CHECK_EQUAL ( false, ba::is_clamped ( hi + 0.01, lo, hi )); + // If we have nextafterf we can be more precise. + #if __cplusplus >= 201103L + assert(lo < hi); + BOOST_CHECK_EQUAL ( true, ba::is_clamped ( hi, lo, hi )); + BOOST_CHECK_EQUAL ( true, ba::is_clamped ( std::nextafterf( lo, hi ), lo, hi )); + BOOST_CHECK_EQUAL ( true, ba::is_clamped ( std::nextafterf( hi, lo ), lo, hi )); + BOOST_CHECK_EQUAL ( true, ba::is_clamped ( (lo + hi) / 2, lo, hi )); + // 1.0 is just for direction of nextafterf, value of 1.0 is not significant. + BOOST_CHECK_EQUAL ( false, ba::is_clamped ( std::nextafterf( lo, lo - 1.0f ), lo, hi )); + BOOST_CHECK_EQUAL ( false, ba::is_clamped ( std::nextafterf( hi, hi + 1.0f ), lo, hi )); + #endif + } +} + +void test_std_string() { + BOOST_CHECK_EQUAL ( true, ba::is_clamped ( std::string("a3"), std::string("a1"), std::string("a6") )); + BOOST_CHECK_EQUAL ( true, ba::is_clamped ( std::string("a1"), std::string("a1"), std::string("a6") )); + BOOST_CHECK_EQUAL ( true, ba::is_clamped ( std::string("a6"), std::string("a1"), std::string("a6") )); + BOOST_CHECK_EQUAL ( false, ba::is_clamped ( std::string("a7"), std::string("a1"), std::string("a6") )); + BOOST_CHECK_EQUAL ( false, ba::is_clamped ( std::string("a0"), std::string("a1"), std::string("a6") )); +} + +void test_custom() { + // Inside the range, equal to the endpoints, and outside the endpoints. + const custom c0(0); + const custom c1(1); + const custom c3(3); + const custom c6(6); + const custom c7(7); + BOOST_CHECK_EQUAL ( true, ba::is_clamped ( c3, c1, c6 )); + BOOST_CHECK_EQUAL ( true, ba::is_clamped ( c1, c1, c6 )); + BOOST_CHECK_EQUAL ( true, ba::is_clamped ( c6, c1, c6 )); + BOOST_CHECK_EQUAL ( false, ba::is_clamped ( c0, c1, c6 )); + BOOST_CHECK_EQUAL ( false, ba::is_clamped ( c7, c1, c6 )); + + BOOST_CHECK_EQUAL ( true, ba::is_clamped ( c3, c1, c6, customLess )); + BOOST_CHECK_EQUAL ( true, ba::is_clamped ( c1, c1, c6, customLess )); + BOOST_CHECK_EQUAL ( true, ba::is_clamped ( c6, c1, c6, customLess )); + BOOST_CHECK_EQUAL ( false, ba::is_clamped ( c0, c1, c6, customLess )); + BOOST_CHECK_EQUAL ( false, ba::is_clamped ( c7, c1, c6, customLess )); +} + +void test_constexpr() { + #if __cplusplus >= 201402L + { + constexpr bool is_clamped = (ba::is_clamped ( 3, 1, 6 )); + BOOST_CHECK_EQUAL (true, is_clamped ); + } + { + constexpr bool is_clamped = (ba::is_clamped ( 1, 1, 6 )); + BOOST_CHECK_EQUAL (true, is_clamped ); + } + { + constexpr bool is_clamped = (ba::is_clamped ( 6, 1, 6 )); + BOOST_CHECK_EQUAL (true, is_clamped ); + } + { + constexpr bool is_clamped = (ba::is_clamped ( 0, 1, 6 )); + BOOST_CHECK_EQUAL(false, is_clamped ); + } + { + constexpr bool is_clamped = (ba::is_clamped ( 7, 1, 6 )); + BOOST_CHECK_EQUAL(false, is_clamped ); + } + #endif +} + + +#ifdef __cpp_impl_three_way_comparison +struct custom_with_spaceship { + int v; + auto operator<=>(const custom_with_spaceship&) const = default; +}; +#endif + +void test_spaceship() { + #ifdef __cpp_impl_three_way_comparison + // Inside the range, equal to the endpoints, and outside the endpoints. + const custom_with_spaceship c0(0); + const custom_with_spaceship c1(1); + const custom_with_spaceship c3(3); + const custom_with_spaceship c6(6); + const custom_with_spaceship c7(7); + BOOST_CHECK_EQUAL ( true, ba::is_clamped (c3, c1, c6 )); + BOOST_CHECK_EQUAL ( true, ba::is_clamped (c1, c1, c6 )); + BOOST_CHECK_EQUAL ( true, ba::is_clamped (c6, c1, c6 )); + BOOST_CHECK_EQUAL ( false, ba::is_clamped (c0, c1, c6 )); + BOOST_CHECK_EQUAL ( false, ba::is_clamped (c7, c1, c6 )); + { + constexpr custom_with_spaceship c1(1); + constexpr custom_with_spaceship c3(3); + constexpr custom_with_spaceship c6(6); + constexpr bool clamped = ba::is_clamped (c3, c1, c6 ); + BOOST_CHECK_EQUAL ( true, clamped ); + } + #endif +} + +BOOST_AUTO_TEST_CASE(test_main) { + test_ints(); + test_floats(); + test_std_string(); + test_custom(); + test_constexpr(); + test_spaceship(); +} + +#if __cplusplus >= 201103L +typedef std::tuple test_types_tuple; + +BOOST_AUTO_TEST_CASE_TEMPLATE(test_extremes, T, test_types_tuple) { + const T max = std::numeric_limits::max(); + BOOST_CHECK_EQUAL(true, ba::is_clamped( max, max, max )); + BOOST_CHECK_EQUAL(true, ba::is_clamped( max, max - 1, max )); + BOOST_CHECK_EQUAL(false, ba::is_clamped( max - 1, max, max )); + + const T min = std::numeric_limits::min(); + BOOST_CHECK_EQUAL(true, ba::is_clamped( min, min, min )); + BOOST_CHECK_EQUAL(true, ba::is_clamped( min, min, min + 1 )); + BOOST_CHECK_EQUAL(false, ba::is_clamped( min, min + 1, min + 1 )); +} +#endif From 02b05e5e2429ccb9657052cb3d5908c324520885 Mon Sep 17 00:00:00 2001 From: Ivan Matek Date: Sun, 1 Aug 2021 00:48:46 +0200 Subject: [PATCH 24/63] rm unneeded include --- include/boost/algorithm/is_clamped.hpp | 1 - 1 file changed, 1 deletion(-) diff --git a/include/boost/algorithm/is_clamped.hpp b/include/boost/algorithm/is_clamped.hpp index a736fba32..b4fe8225c 100644 --- a/include/boost/algorithm/is_clamped.hpp +++ b/include/boost/algorithm/is_clamped.hpp @@ -15,7 +15,6 @@ #define BOOST_ALGORITHM_IS_CLAMPED_HPP #include // For std::less -#include // For std::iterator_traits #include #include // for identity From aab7e1c1217ca5e5eb4ac051d163358c3a062c64 Mon Sep 17 00:00:00 2001 From: Ivan Matek Date: Sun, 29 Aug 2021 23:02:22 +0200 Subject: [PATCH 25/63] fix spaceship support macro check, proper order of includes in test --- test/is_clamped_test.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/is_clamped_test.cpp b/test/is_clamped_test.cpp index d5ea2b1dc..e2d5cbaf9 100644 --- a/test/is_clamped_test.cpp +++ b/test/is_clamped_test.cpp @@ -3,11 +3,11 @@ // Boost Software License, Version 1.0. (See accompanying file // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -#include #include +#include #include #include -#ifdef __cpp_impl_three_way_comparison +#ifdef __cpp_impl_three_way_comparison &&__has_include() #include #endif #include @@ -167,7 +167,7 @@ void test_constexpr() { } -#ifdef __cpp_impl_three_way_comparison +#ifdef __cpp_impl_three_way_comparison &&__has_include() struct custom_with_spaceship { int v; auto operator<=>(const custom_with_spaceship&) const = default; @@ -175,7 +175,7 @@ struct custom_with_spaceship { #endif void test_spaceship() { - #ifdef __cpp_impl_three_way_comparison + #ifdef __cpp_impl_three_way_comparison &&__has_include() // Inside the range, equal to the endpoints, and outside the endpoints. const custom_with_spaceship c0(0); const custom_with_spaceship c1(1); From ba3f706b1d726f36214a3281f7ffec1c0e1e9343 Mon Sep 17 00:00:00 2001 From: Ivan Matek Date: Sun, 29 Aug 2021 23:05:56 +0200 Subject: [PATCH 26/63] comment uniformization --- include/boost/algorithm/is_clamped.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/boost/algorithm/is_clamped.hpp b/include/boost/algorithm/is_clamped.hpp index b4fe8225c..0d541f86b 100644 --- a/include/boost/algorithm/is_clamped.hpp +++ b/include/boost/algorithm/is_clamped.hpp @@ -48,10 +48,10 @@ namespace boost { namespace algorithm { /// \fn is_clamped ( T const& val, /// typename boost::mpl::identity::type const & lo, /// typename boost::mpl::identity::type const & hi) -/// \returns true if value "val" is in the range [ lo, hi ] +/// \returns true if value val is in the range [ lo, hi ] /// using operator < for comparison. /// If the value is less than lo, return false. -/// If the value is greater than "hi", return false. +/// If the value is greater than hi, return false. /// Otherwise, returns true. /// /// \param val The value to be checked From c5f6f52560545e8bd70e390a70c55dd2ff308d0f Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Sun, 29 Aug 2021 16:19:52 -0700 Subject: [PATCH 27/63] Remove dependency on boost::mpl from 'clamp' and 'is_sorted' --- include/boost/algorithm/clamp.hpp | 20 ++++++++++---------- include/boost/algorithm/cxx11/is_sorted.hpp | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/boost/algorithm/clamp.hpp b/include/boost/algorithm/clamp.hpp index 82a99bde0..1378f95b4 100644 --- a/include/boost/algorithm/clamp.hpp +++ b/include/boost/algorithm/clamp.hpp @@ -26,14 +26,14 @@ #include #include #include -#include // for identity -#include // for boost::disable_if +#include // for boost::type_identity +#include // for boost::disable_if namespace boost { namespace algorithm { /// \fn clamp ( T const& val, -/// typename boost::mpl::identity::type const & lo, -/// typename boost::mpl::identity::type const & hi, Pred p ) +/// typename boost::type_identity::type const & lo, +/// typename boost::type_identity::type const & hi, Pred p ) /// \return the value "val" brought into the range [ lo, hi ] /// using the comparison predicate p. /// If p ( val, lo ) return lo. @@ -48,8 +48,8 @@ namespace boost { namespace algorithm { /// template BOOST_CXX14_CONSTEXPR T const & clamp ( T const& val, - typename boost::mpl::identity::type const & lo, - typename boost::mpl::identity::type const & hi, Pred p ) + typename boost::type_identity::type const & lo, + typename boost::type_identity::type const & hi, Pred p ) { // assert ( !p ( hi, lo )); // Can't assert p ( lo, hi ) b/c they might be equal return p ( val, lo ) ? lo : p ( hi, val ) ? hi : val; @@ -57,8 +57,8 @@ namespace boost { namespace algorithm { /// \fn clamp ( T const& val, -/// typename boost::mpl::identity::type const & lo, -/// typename boost::mpl::identity::type const & hi ) +/// typename boost::identity::type const & lo, +/// typename boost::identity::type const & hi ) /// \return the value "val" brought into the range [ lo, hi ]. /// If the value is less than lo, return lo. /// If the value is greater than "hi", return hi. @@ -70,8 +70,8 @@ namespace boost { namespace algorithm { /// template BOOST_CXX14_CONSTEXPR T const& clamp ( const T& val, - typename boost::mpl::identity::type const & lo, - typename boost::mpl::identity::type const & hi ) + typename boost::type_identity::type const & lo, + typename boost::type_identity::type const & hi ) { return boost::algorithm::clamp ( val, lo, hi, std::less()); } diff --git a/include/boost/algorithm/cxx11/is_sorted.hpp b/include/boost/algorithm/cxx11/is_sorted.hpp index 0aa812236..e02fb3645 100644 --- a/include/boost/algorithm/cxx11/is_sorted.hpp +++ b/include/boost/algorithm/cxx11/is_sorted.hpp @@ -22,7 +22,7 @@ #include #include -#include +#include // for boost::type_identity namespace boost { namespace algorithm { @@ -127,7 +127,7 @@ namespace boost { namespace algorithm { /// \param p A binary predicate that returns true if two elements are ordered. /// template - BOOST_CXX14_CONSTEXPR typename boost::lazy_disable_if_c< boost::is_same::value, boost::mpl::identity >::type + BOOST_CXX14_CONSTEXPR typename boost::lazy_disable_if_c< boost::is_same::value, boost::type_identity >::type is_sorted ( const R &range, Pred p ) { return boost::algorithm::is_sorted ( boost::begin ( range ), boost::end ( range ), p ); From 240904836885fa5b424f607834c338524521f571 Mon Sep 17 00:00:00 2001 From: Ivan Matek Date: Tue, 31 Aug 2021 21:39:59 +0200 Subject: [PATCH 28/63] fix spaceship detection macros, add tests for point interval and first argument determines type --- test/is_clamped_test.cpp | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/test/is_clamped_test.cpp b/test/is_clamped_test.cpp index e2d5cbaf9..149edec80 100644 --- a/test/is_clamped_test.cpp +++ b/test/is_clamped_test.cpp @@ -7,9 +7,14 @@ #include #include #include -#ifdef __cpp_impl_three_way_comparison &&__has_include() +#ifdef __cpp_impl_three_way_comparison +#if __has_include() +#define BOOST_IS_CLAMPED_TEST_SPACESHIP +#endif +#ifdef BOOST_IS_CLAMPED_TEST_SPACESHIP #include #endif +#endif #include #include #include @@ -84,11 +89,11 @@ void test_ints() { BOOST_CHECK_EQUAL ( false, ba::is_clamped ( 0U, 1, 6. )); BOOST_CHECK_EQUAL ( false, ba::is_clamped ( 8U, 1, 6. )); - short foo = 50; // float->short conversion does not round - BOOST_CHECK_EQUAL ( true, ba::is_clamped ( foo, 50.999, 100 )); - BOOST_CHECK_EQUAL ( false, ba::is_clamped ( foo, 51.001, 100 )); + BOOST_CHECK_EQUAL ( true, ba::is_clamped ( 50, 50.999, 100 )); + BOOST_CHECK_EQUAL ( false, ba::is_clamped ( 50, 51.001, 100 )); } + void test_floats() { // If floats are IEEE754 certain floats have exact representations. if (std::numeric_limits::is_iec559) { @@ -141,6 +146,21 @@ void test_custom() { BOOST_CHECK_EQUAL ( false, ba::is_clamped ( c7, c1, c6, customLess )); } +void test_point_interval() { + BOOST_CHECK_EQUAL(true, ba::is_clamped(1, 1, 1)); + BOOST_CHECK_EQUAL(false, ba::is_clamped(0, 1, 1)); + BOOST_CHECK_EQUAL(false, ba::is_clamped(2, 1, 1)); +} + +void test_first_argument_determines_types() { + // all arguments are int + BOOST_CHECK_EQUAL(true, ba::is_clamped(5, 5.9, 6.1)); + BOOST_CHECK_EQUAL(true, ba::is_clamped(6, 5.9, 6.1)); + // all arguments are double + BOOST_CHECK_EQUAL(false, ba::is_clamped(5.0, 5.9, 6.1)); + BOOST_CHECK_EQUAL(false, ba::is_clamped(6.2, 5.9, 6.1)); +} + void test_constexpr() { #if __cplusplus >= 201402L { @@ -167,7 +187,7 @@ void test_constexpr() { } -#ifdef __cpp_impl_three_way_comparison &&__has_include() +#ifdef BOOST_IS_CLAMPED_TEST_SPACESHIP struct custom_with_spaceship { int v; auto operator<=>(const custom_with_spaceship&) const = default; @@ -175,7 +195,7 @@ struct custom_with_spaceship { #endif void test_spaceship() { - #ifdef __cpp_impl_three_way_comparison &&__has_include() + #ifdef BOOST_IS_CLAMPED_TEST_SPACESHIP // Inside the range, equal to the endpoints, and outside the endpoints. const custom_with_spaceship c0(0); const custom_with_spaceship c1(1); @@ -202,6 +222,8 @@ BOOST_AUTO_TEST_CASE(test_main) { test_floats(); test_std_string(); test_custom(); + test_point_interval(); + test_first_argument_determines_types(); test_constexpr(); test_spaceship(); } From d717d999be4ad4557d303d85ba2c6924a0f78ce1 Mon Sep 17 00:00:00 2001 From: Ivan Matek Date: Tue, 31 Aug 2021 21:45:41 +0200 Subject: [PATCH 29/63] boost::type_identity modernization --- include/boost/algorithm/is_clamped.hpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/include/boost/algorithm/is_clamped.hpp b/include/boost/algorithm/is_clamped.hpp index 0d541f86b..8619564e3 100644 --- a/include/boost/algorithm/is_clamped.hpp +++ b/include/boost/algorithm/is_clamped.hpp @@ -17,7 +17,7 @@ #include // For std::less #include -#include // for identity +#include // for boost::type_identity namespace boost { namespace algorithm { @@ -38,8 +38,8 @@ namespace boost { namespace algorithm { /// template BOOST_CXX14_CONSTEXPR bool is_clamped( - T const& val, typename boost::mpl::identity::type const& lo, - typename boost::mpl::identity::type const& hi, Pred p) { + T const& val, typename boost::type_identity::type const& lo, + typename boost::type_identity::type const& hi, Pred p) { // assert ( !p ( hi, lo )); // Can't assert p ( lo, hi ) b/c they // might be equal return p(val, lo) ? false : p(hi, val) ? false : true; @@ -48,7 +48,7 @@ namespace boost { namespace algorithm { /// \fn is_clamped ( T const& val, /// typename boost::mpl::identity::type const & lo, /// typename boost::mpl::identity::type const & hi) -/// \returns true if value val is in the range [ lo, hi ] +/// \returns true if value "val" is in the range [ lo, hi ] /// using operator < for comparison. /// If the value is less than lo, return false. /// If the value is greater than hi, return false. @@ -60,9 +60,9 @@ namespace boost { namespace algorithm { /// template - BOOST_CXX14_CONSTEXPR bool is_clamped ( const T& val, - typename boost::mpl::identity::type const & lo, - typename boost::mpl::identity::type const & hi ) + BOOST_CXX14_CONSTEXPR bool is_clamped ( const T& val, + typename boost::type_identity::type const & lo, + typename boost::type_identity::type const & hi ) { return boost::algorithm::is_clamped ( val, lo, hi, std::less()); } From 0c2e904c0df23db207f42a087260c25f70bc378f Mon Sep 17 00:00:00 2001 From: Ivan Matek Date: Tue, 31 Aug 2021 21:57:03 +0200 Subject: [PATCH 30/63] fix comments for type_identity --- include/boost/algorithm/is_clamped.hpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/boost/algorithm/is_clamped.hpp b/include/boost/algorithm/is_clamped.hpp index 8619564e3..9238bbcc8 100644 --- a/include/boost/algorithm/is_clamped.hpp +++ b/include/boost/algorithm/is_clamped.hpp @@ -14,7 +14,7 @@ #ifndef BOOST_ALGORITHM_IS_CLAMPED_HPP #define BOOST_ALGORITHM_IS_CLAMPED_HPP -#include // For std::less +#include // for std::less #include #include // for boost::type_identity @@ -22,8 +22,8 @@ namespace boost { namespace algorithm { /// \fn is_clamped ( T const& val, -/// typename boost::mpl::identity::type const & lo, -/// typename boost::mpl::identity::type const & hi, Pred p ) +/// typename boost::type_identity::type const & lo, +/// typename boost::type_identity::type const & hi, Pred p ) /// \returns true if value "val" is in the range [ lo, hi ] /// using the comparison predicate p. /// If p ( val, lo ) return false. @@ -46,8 +46,8 @@ namespace boost { namespace algorithm { } /// \fn is_clamped ( T const& val, -/// typename boost::mpl::identity::type const & lo, -/// typename boost::mpl::identity::type const & hi) +/// typename boost::type_identity::type const & lo, +/// typename boost::type_identity::type const & hi) /// \returns true if value "val" is in the range [ lo, hi ] /// using operator < for comparison. /// If the value is less than lo, return false. From 9031f17bb818a1cb80c6185be1856466dd08bda9 Mon Sep 17 00:00:00 2001 From: Ivan Matek Date: Mon, 13 Sep 2021 00:22:03 +0200 Subject: [PATCH 31/63] update CR --- include/boost/algorithm/is_clamped.hpp | 2 +- test/is_clamped_test.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/boost/algorithm/is_clamped.hpp b/include/boost/algorithm/is_clamped.hpp index 9238bbcc8..3f004440f 100644 --- a/include/boost/algorithm/is_clamped.hpp +++ b/include/boost/algorithm/is_clamped.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) Marshall Clow 2008-2012. + Copyright (c) Ivan Matek, Marshall Clow 2021. 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) diff --git a/test/is_clamped_test.cpp b/test/is_clamped_test.cpp index 149edec80..575e34305 100644 --- a/test/is_clamped_test.cpp +++ b/test/is_clamped_test.cpp @@ -1,4 +1,4 @@ -// (C) Copyright TODO +// (C) Copyright Ivan Matek, Marshall Clow 2021. // Use, modification and distribution are subject to 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) From 9d5ddb6a7a4f318738f98aa1f65f84c8b01de2b7 Mon Sep 17 00:00:00 2001 From: Ivan Matek Date: Mon, 13 Sep 2021 00:28:03 +0200 Subject: [PATCH 32/63] update authors --- include/boost/algorithm/is_clamped.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/boost/algorithm/is_clamped.hpp b/include/boost/algorithm/is_clamped.hpp index 3f004440f..72287d302 100644 --- a/include/boost/algorithm/is_clamped.hpp +++ b/include/boost/algorithm/is_clamped.hpp @@ -8,7 +8,7 @@ /// \file is_clamped.hpp /// \brief IsClamped algorithm -/// \author TODO +/// \authors Ivan Matek, Marshall Clow /// #ifndef BOOST_ALGORITHM_IS_CLAMPED_HPP From a9cd6c353f909bbebbb39009ddd6f1635d2dfc00 Mon Sep 17 00:00:00 2001 From: Antony Polukhin Date: Sun, 3 Oct 2021 17:16:12 +0300 Subject: [PATCH 33/63] fix -Wdeprecated-copy warnings in string algorithms --- .../algorithm/string/detail/find_iterator.hpp | 14 ++++++++-- .../boost/algorithm/string/find_iterator.hpp | 28 ++++++++++++++++++- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/include/boost/algorithm/string/detail/find_iterator.hpp b/include/boost/algorithm/string/detail/find_iterator.hpp index 4f90a98fc..c99078525 100644 --- a/include/boost/algorithm/string/detail/find_iterator.hpp +++ b/include/boost/algorithm/string/detail/find_iterator.hpp @@ -40,10 +40,18 @@ namespace boost { // Protected construction/destruction // Default constructor - find_iterator_base() {} + BOOST_DEFAULTED_FUNCTION(find_iterator_base(), {}) + // Copy construction - find_iterator_base( const find_iterator_base& Other ) : + BOOST_DEFAULTED_FUNCTION(find_iterator_base( const find_iterator_base& Other ), : m_Finder(Other.m_Finder) {} + ) + + // Assignment + BOOST_DEFAULTED_FUNCTION(find_iterator_base& operator=( const find_iterator_base& Other ), { + m_Finder = Other.m_Finder; + return *this; + }) // Constructor template @@ -51,7 +59,7 @@ namespace boost { m_Finder(Finder) {} // Destructor - ~find_iterator_base() {} + BOOST_DEFAULTED_FUNCTION(~find_iterator_base(), {}) // Find operation match_type do_find( diff --git a/include/boost/algorithm/string/find_iterator.hpp b/include/boost/algorithm/string/find_iterator.hpp index 5a52d92e4..47c20e673 100644 --- a/include/boost/algorithm/string/find_iterator.hpp +++ b/include/boost/algorithm/string/find_iterator.hpp @@ -74,7 +74,7 @@ namespace boost { \post eof()==true */ - find_iterator() {} + BOOST_DEFAULTED_FUNCTION(find_iterator(), {}) //! Copy constructor /*! @@ -85,6 +85,18 @@ namespace boost { m_Match(Other.m_Match), m_End(Other.m_End) {} + //! Copy assignment + /*! + Assigns a copy of the find_iterator + */ + BOOST_DEFAULTED_FUNCTION(find_iterator& operator=( const find_iterator& Other ), { + if (this == &Other) return *this; + this->base_type::operator=(Other); + m_Match = Other.m_Match; + m_End = Other.m_End; + return *this; + }) + //! Constructor /*! Construct new find_iterator for a given finder @@ -248,6 +260,20 @@ namespace boost { m_bEof(Other.m_bEof) {} + //! Assignment operator + /*! + Assigns a copy of the split_iterator + */ + BOOST_DEFAULTED_FUNCTION(split_iterator& operator=( const split_iterator& Other ), { + if (this == &Other) return *this; + this->base_type::operator=(Other); + m_Match = Other.m_Match; + m_Next = Other.m_Next; + m_End = Other.m_End; + m_bEof = Other.m_bEof; + return *this; + }) + //! Constructor /*! Construct new split_iterator for a given finder From 02f436c25dd4a5b23df945085a2f1d6ce4c3a5e9 Mon Sep 17 00:00:00 2001 From: Jonathan Gopel Date: Sun, 5 Jun 2022 14:03:16 +0000 Subject: [PATCH 34/63] Add documentation to transform_inclusive_scan Problem: - There is no documentation for the existing functions. This will make it harder for users to consume these functions, especially as new variants are added. Solution: - Add documentation. --- doc/algorithm.qbk | 6 +++- .../cxx17/transform_inclusive_scan.hpp | 29 +++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/doc/algorithm.qbk b/doc/algorithm.qbk index 64e8dfb70..06d809280 100644 --- a/doc/algorithm.qbk +++ b/doc/algorithm.qbk @@ -106,6 +106,11 @@ Generate an increasing series Apply a functor to the elements of a sequence [endsect:for_each_n] +[section:transform_inclusive_scan transform_inclusive_scan] +[*[^[link boost.algorithm.transform_inclusive_scan transform_inclusive_scan] ] ] +Transform each element in a range then combine adjacent elements to create an output range. Inclusive scaning means that the nth input is present in the nth output. +[endsect:transform_inclusive_scan] + [endsect:CXX17_inner_algorithms] [endsect:CXX17] @@ -235,7 +240,6 @@ Raise a value to an integral power ([^constexpr] since C++14) * [*[^[link header.boost.algorithm.cxx17.inclusive_scan_hpp inclusive_scan] ] ] * [*[^[link header.boost.algorithm.cxx17.reduce_hpp reduce] ] ] * [*[^[link header.boost.algorithm.cxx17.transform_exclusive_scan_hpp transform_exclusive_scan] ] ] -* [*[^[link header.boost.algorithm.cxx17.transform_inclusive_scan_hpp transform_inclusive_scan] ] ] * [*[^[link header.boost.algorithm.cxx17.transform_reduce_hpp transform_reduce] ] ] [endsect:not_yet_documented_cxx17_algos] diff --git a/include/boost/algorithm/cxx17/transform_inclusive_scan.hpp b/include/boost/algorithm/cxx17/transform_inclusive_scan.hpp index 31607703e..9d877c02d 100644 --- a/include/boost/algorithm/cxx17/transform_inclusive_scan.hpp +++ b/include/boost/algorithm/cxx17/transform_inclusive_scan.hpp @@ -22,6 +22,21 @@ namespace boost { namespace algorithm { +/// \fn transform_inclusive_scan ( InputIterator first, InputIterator last, OutputIterator result, BinaryOperation bOp, UnaryOperation uOp, T init ) +/// \brief Transforms elements from the input range with uOp and then combines +/// those transformed elements with bOp such that the n-1th element and the nth +/// element are combined. Inclusivity means that the nth element is included in +/// the nth combination. +/// \return The updated output iterator +/// +/// \param first The start of the input sequence +/// \param last The end of the input sequence +/// \param result The output iterator to write the results into +/// \param bOp The operation for combining transformed input elements +/// \param uOp The operation for transforming input elements +/// \param init The initial value +/// +/// \note This function is part of the C++17 standard library template OutputIterator transform_inclusive_scan(InputIterator first, InputIterator last, @@ -37,6 +52,20 @@ OutputIterator transform_inclusive_scan(InputIterator first, InputIterator last, return result; } +/// \fn transform_inclusive_scan ( InputIterator first, InputIterator last, OutputIterator result, BinaryOperation bOp, UnaryOperation uOp, T init ) +/// \brief Transforms elements from the input range with uOp and then combines +/// those transformed elements with bOp such that the n-1th element and the nth +/// element are combined. Inclusivity means that the nth element is included in +/// the nth combination. The first value will be used as the init. +/// \return The updated output iterator +/// +/// \param first The start of the input sequence +/// \param last The end of the input sequence +/// \param result The output iterator to write the results into +/// \param bOp The operation for combining transformed input elements +/// \param uOp The operation for transforming input elements +/// +/// \note This function is part of the C++17 standard library template OutputIterator transform_inclusive_scan(InputIterator first, InputIterator last, From 6b7a38f639d3aa549bece0f42505d0c5bc52e33a Mon Sep 17 00:00:00 2001 From: Jonathan Gopel Date: Sun, 5 Jun 2022 14:18:33 +0000 Subject: [PATCH 35/63] Add documentation to transform_exclusive_scan Problem: - There is no documentation for the existing functions. This will make it harder for users to consume these functions, espcially as new variants are added. Solution: - Add documentation. --- doc/algorithm.qbk | 6 +++++- .../algorithm/cxx17/transform_exclusive_scan.hpp | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/doc/algorithm.qbk b/doc/algorithm.qbk index 06d809280..50b3044c7 100644 --- a/doc/algorithm.qbk +++ b/doc/algorithm.qbk @@ -111,6 +111,11 @@ Apply a functor to the elements of a sequence Transform each element in a range then combine adjacent elements to create an output range. Inclusive scaning means that the nth input is present in the nth output. [endsect:transform_inclusive_scan] +[section:transform_exclusive_scan transform_exclusive_scan] +[*[^[link boost.algorithm.transform_exclusive_scan transform_exclusive_scan] ] ] +Transform each element in a range then combine adjacent elements to create an output range. Exclusive scanning means that the nth input is not present in the nth output. +[endsect:transform_exclusive_scan] + [endsect:CXX17_inner_algorithms] [endsect:CXX17] @@ -239,7 +244,6 @@ Raise a value to an integral power ([^constexpr] since C++14) * [*[^[link header.boost.algorithm.cxx17.exclusive_scan_hpp exclusive_scan] ] ] * [*[^[link header.boost.algorithm.cxx17.inclusive_scan_hpp inclusive_scan] ] ] * [*[^[link header.boost.algorithm.cxx17.reduce_hpp reduce] ] ] -* [*[^[link header.boost.algorithm.cxx17.transform_exclusive_scan_hpp transform_exclusive_scan] ] ] * [*[^[link header.boost.algorithm.cxx17.transform_reduce_hpp transform_reduce] ] ] [endsect:not_yet_documented_cxx17_algos] diff --git a/include/boost/algorithm/cxx17/transform_exclusive_scan.hpp b/include/boost/algorithm/cxx17/transform_exclusive_scan.hpp index 68318a59a..86446b803 100644 --- a/include/boost/algorithm/cxx17/transform_exclusive_scan.hpp +++ b/include/boost/algorithm/cxx17/transform_exclusive_scan.hpp @@ -22,6 +22,21 @@ namespace boost { namespace algorithm { +/// \fn transform_exclusive_scan ( InputIterator first, InputIterator last, OutputIterator result, BinaryOperation bOp, UnaryOperation uOp, T init ) +/// \brief Transforms elements from the input range with uOp and then combines +/// those transformed elements with bOp such that the n-1th element and the nth +/// element are combined. Exclusivity means that the nth element is not +/// included in the nth combination. +/// \return The updated output iterator +/// +/// \param first The start of the input sequence +/// \param last The end of the input sequence +/// \param result The output iterator to write the results into +/// \param bOp The operation for combining transformed input elements +/// \param uOp The operation for transforming input elements +/// \param init The initial value +/// +/// \note This function is part of the C++17 standard library template OutputIterator transform_exclusive_scan(InputIterator first, InputIterator last, From eec00d8421928099edd46ec693fc2ca27920310b Mon Sep 17 00:00:00 2001 From: Jonathan Gopel Date: Thu, 5 May 2022 16:59:08 -0600 Subject: [PATCH 36/63] Implement copy_if_while and copy_if_until Problem: - There is no way to signal that a copy should proceed, selecting elements by a predicate until some condition is met. This is useful for patterns along the lines of "copy selected elements until there are n total elements in the output". Solution: - Introduce `copy_if_while()` and `copy_if_until()`. --- doc/algorithm.qbk | 14 +- include/boost/algorithm/cxx11/copy_if.hpp | 80 +++++++ test/copy_if_test1.cpp | 241 +++++++++++++++++++++- 3 files changed, 328 insertions(+), 7 deletions(-) diff --git a/doc/algorithm.qbk b/doc/algorithm.qbk index 64e8dfb70..391a198e5 100644 --- a/doc/algorithm.qbk +++ b/doc/algorithm.qbk @@ -206,14 +206,24 @@ See below [section:copy_until copy_until ] [*[^[link header.boost.algorithm.cxx11.copy_if_hpp copy_until] ] ] -Copy all the elements at the start of the input range that do not satisfy the predicate to the output range +Copy all the elements from the start of the input range to the output range until the predicate is satisfied [endsect:copy_until] [section:copy_while copy_while ] [*[^[link header.boost.algorithm.cxx11.copy_if_hpp copy_while] ] ] -Copy all the elements at the start of the input range that satisfy the predicate to the output range +Copy all the elements from the start of the input range to the output range while the predicate is satisfied [endsect:copy_while] +[section:copy_if_until copy_if_until ] +[*[^[link header.boost.algorithm.cxx11.copy_if_hpp copy_if_until ] ] +Copy all elements that satisfy the element predicate from the start of the input range to the output range until the termination predicate is satisfied +[endsect:copy_if_until] + +[section:copy_if_while copy_if_while ] +[*[^[link header.boost.algorithm.cxx11.copy_if_hpp copy_if_while ] ] +Copy all elements that satisfy the element predicate from the start of the input range to the output range while the termination predicate is satisfied +[endsect:copy_if_while] + [section:iota_n iota_n ] [*[^[link boost.algorithm.iota_n iota_n] ] ] Write a sequence of n increasing values to an output iterator diff --git a/include/boost/algorithm/cxx11/copy_if.hpp b/include/boost/algorithm/cxx11/copy_if.hpp index d3914bf20..307c21310 100644 --- a/include/boost/algorithm/cxx11/copy_if.hpp +++ b/include/boost/algorithm/cxx11/copy_if.hpp @@ -126,6 +126,86 @@ copy_until ( const Range &r, OutputIterator result, Predicate p ) return boost::algorithm::copy_until (boost::begin (r), boost::end(r), result, p); } +/// \fn copy_if_while ( InputIterator first, InputIterator last, OutputIterator result, CopyPredicate copy_pred, TerminatePred term_pred ) +/// \brief Copies all the elements from the input range that satisfy the +/// copy predicate to the output range while the termination predicate is +/// satisfied. +/// \return The updated output iterator +/// +/// \param first The start of the input sequence +/// \param last One past the end of the input sequence +/// \param result An output iterator to write the results into +/// \param copy_pred A predicate for testing whether to the current element +/// \param term_pred A predicate for testing whether to end the copy operation +template +BOOST_CXX14_CONSTEXPR std::pair +copy_if_while ( InputIterator first, InputIterator last, OutputIterator result, CopyPredicate copy_pred, TerminatePred term_pred) +{ + for ( ; first != last && term_pred(*first); ++first ) { + if (copy_pred(*first)) { + *result++ = *first; + } + } + return std::make_pair(first, result); +} + +/// \fn copy_if_while ( const Range& r, OutputIterator result, CopyPredicate copy_pred, TerminatePred term_pred ) +/// \brief Copies all the elements from the input range that satisfy the +/// copy predicate to the output range while the termination predicate is +/// satisfied. +/// \return The updated output iterator +/// +/// \param r The input range +/// \param result An output iterator to write the results into +/// \param copy_pred A predicate for testing whether to the current element +/// \param term_pred A predicate for testing whether to end the copy operation +template +BOOST_CXX14_CONSTEXPR std::pair::type, OutputIterator> +copy_if_while ( const Range& r, OutputIterator result, CopyPredicate copy_pred, TerminatePred term_pred) +{ + return boost::algorithm::copy_if_while(boost::begin(r), boost::end(r), result, copy_pred, term_pred); +} + +/// \fn copy_if_until ( InputIterator first, InputIterator last, OutputIterator result, CopyPredicate copy_pred, TerminatePred term_pred ) +/// \brief Copies all the elements from the input range that satisfy the +/// copy predicate to the output range until the termination predicate is +/// satisfied. +/// \return The updated output iterator +/// +/// \param first The start of the input sequence +/// \param last One past the end of the input sequence +/// \param result An output iterator to write the results into +/// \param copy_pred A predicate for testing whether to the current element +/// \param term_pred A predicate for testing whether to end the copy operation +template +BOOST_CXX14_CONSTEXPR std::pair +copy_if_until ( InputIterator first, InputIterator last, OutputIterator result, CopyPredicate copy_pred, TerminatePred term_pred) +{ + for ( ; first != last && !term_pred(*first); ++first ) { + if (copy_pred(*first)) { + *result++ = *first; + } + } + return std::make_pair(first, result); +} + +/// \fn copy_if_until ( const Range& r, OutputIterator result, CopyPredicate copy_pred, TerminatePred term_pred ) +/// \brief Copies all the elements from the input range that satisfy the +/// copy predicate to the output range until the termination predicate is +/// satisfied. +/// \return The updated output iterator +/// +/// \param r The input range +/// \param result An output iterator to write the results into +/// \param copy_pred A predicate for testing whether to the current element +/// \param term_pred A predicate for testing whether to end the copy operation +template +BOOST_CXX14_CONSTEXPR std::pair::type, OutputIterator> +copy_if_until ( const Range& r, OutputIterator result, CopyPredicate copy_pred, TerminatePred term_pred) +{ + return boost::algorithm::copy_if_until(boost::begin(r), boost::end(r), result, copy_pred, term_pred); +} + }} // namespace boost and algorithm #endif // BOOST_ALGORITHM_COPY_IF_HPP diff --git a/test/copy_if_test1.cpp b/test/copy_if_test1.cpp index b275f5f5d..574a17528 100644 --- a/test/copy_if_test1.cpp +++ b/test/copy_if_test1.cpp @@ -34,13 +34,15 @@ BOOST_CXX14_CONSTEXPR bool is_even ( int v ) { return v % 2 == 0; } BOOST_CXX14_CONSTEXPR bool is_odd ( int v ) { return v % 2 == 1; } BOOST_CXX14_CONSTEXPR bool is_zero ( int v ) { return v == 0; } +BOOST_CXX14_CONSTEXPR bool less_than_ten ( int v ) { return v < 10; } +BOOST_CXX14_CONSTEXPR bool greater_than_ten ( int v ) { return v > 10; } template void test_copy_if ( Container const &c ) { typedef typename Container::value_type value_type; std::vector v; - + // None of the elements v.clear (); ba::copy_if ( c.begin (), c.end (), back_inserter ( v ), is_false); @@ -118,6 +120,160 @@ void test_copy_while ( Container const &c ) { BOOST_CHECK ( std::equal ( v.begin (), v.end (), c.begin ())); } +template +void test_copy_if_while ( Container const &c ) { + + typedef typename Container::value_type value_type; + typename Container::const_iterator it; + +// Terminate immediately + { + std::vector v; + ba::copy_if_while ( c.begin (), c.end (), back_inserter ( v ), is_true, is_false); + BOOST_CHECK ( v.size () == 0 ); + } + { + std::vector v; + ba::copy_if_while ( c, back_inserter ( v ), is_true, is_false); + BOOST_CHECK ( v.size () == 0 ); + } + +// Copy nothing - never terminate + { + std::vector v; + ba::copy_if_while ( c.begin (), c.end (), back_inserter ( v ), is_false, is_true); + BOOST_CHECK ( v.size () == 0 ); + } + { + std::vector v; + ba::copy_if_while ( c, back_inserter ( v ), is_false, is_true); + BOOST_CHECK ( v.size () == 0 ); + } + +// Copy everything + { + std::vector v; + ba::copy_if_while ( c.begin (), c.end (), back_inserter ( v ), is_true, is_true); + BOOST_CHECK ( v.size () == c.size() ); + BOOST_CHECK ( std::equal ( v.begin (), v.end (), c.begin ())); + } + { + std::vector v; + ba::copy_if_while ( c, back_inserter ( v ), is_true, is_true); + BOOST_CHECK ( v.size () == c.size() ); + BOOST_CHECK ( std::equal ( v.begin (), v.end (), c.begin ())); + } + +// Copy all evens + { + std::vector v; + ba::copy_if_while ( c.begin (), c.end (), back_inserter ( v ), is_even, is_true); + BOOST_CHECK ( v.size () == (size_t) std::count_if ( c.begin (), c.end (), is_even )); + BOOST_CHECK ( ba::all_of ( v.begin (), v.end (), is_even )); + } + { + std::vector v; + ba::copy_if_while ( c, back_inserter ( v ), is_even, is_true); + BOOST_CHECK ( v.size () == (size_t) std::count_if ( c.begin (), c.end (), is_even )); + BOOST_CHECK ( ba::all_of ( v.begin (), v.end (), is_even )); + } + +// Copy some until termination + { + std::vector v; + typename Container::const_iterator it = ba::copy_if_while ( + c.begin (), c.end (), back_inserter ( v ), is_even, less_than_ten).first; + BOOST_CHECK ( it == std::find_if ( c.begin(), c.end(), greater_than_ten )); + BOOST_CHECK ( v.size () == std::count_if ( c.begin(), it, is_even )); + BOOST_CHECK ( ba::all_of ( v.begin (), v.end (), is_even )); + } + { + std::vector v; + typename Container::const_iterator it = ba::copy_if_while ( + c, back_inserter ( v ), is_even, less_than_ten).first; + BOOST_CHECK ( it == std::find_if ( c.begin(), c.end(), greater_than_ten )); + BOOST_CHECK ( v.size () == std::count_if ( c.begin(), it, is_even )); + BOOST_CHECK ( ba::all_of ( v.begin (), v.end (), is_even )); + } + } + +template +void test_copy_if_until ( Container const &c ) { + + typedef typename Container::value_type value_type; + typename Container::const_iterator it; + +// Terminate immediately + { + std::vector v; + ba::copy_if_until ( c.begin (), c.end (), back_inserter ( v ), is_true, is_true); + BOOST_CHECK ( v.size () == 0 ); + } + { + std::vector v; + ba::copy_if_until ( c, back_inserter ( v ), is_true, is_true); + BOOST_CHECK ( v.size () == 0 ); + } + +// Copy nothing - never terminate + { + std::vector v; + ba::copy_if_until ( c.begin (), c.end (), back_inserter ( v ), is_false, is_false); + BOOST_CHECK ( v.size () == 0 ); + } + { + std::vector v; + ba::copy_if_until ( c, back_inserter ( v ), is_false, is_false); + BOOST_CHECK ( v.size () == 0 ); + } + +// Copy everything + { + std::vector v; + ba::copy_if_until ( c.begin (), c.end (), back_inserter ( v ), is_true, is_false); + BOOST_CHECK ( v.size () == c.size() ); + BOOST_CHECK ( std::equal ( v.begin (), v.end (), c.begin ())); + } + { + std::vector v; + ba::copy_if_until ( c, back_inserter ( v ), is_true, is_false); + BOOST_CHECK ( v.size () == c.size() ); + BOOST_CHECK ( std::equal ( v.begin (), v.end (), c.begin ())); + } + +// Copy all evens + { + std::vector v; + ba::copy_if_until ( c.begin (), c.end (), back_inserter ( v ), is_even, is_false); + BOOST_CHECK ( v.size () == (size_t) std::count_if ( c.begin (), c.end (), is_even )); + BOOST_CHECK ( ba::all_of ( v.begin (), v.end (), is_even )); + } + { + std::vector v; + ba::copy_if_until ( c, back_inserter ( v ), is_even, is_false); + BOOST_CHECK ( v.size () == (size_t) std::count_if ( c.begin (), c.end (), is_even )); + BOOST_CHECK ( ba::all_of ( v.begin (), v.end (), is_even )); + } + +// Copy some until termination + { + std::vector v; + typename Container::const_iterator it = ba::copy_if_until ( + c.begin (), c.end (), back_inserter ( v ), is_even, greater_than_ten).first; + BOOST_CHECK ( it == std::find_if ( c.begin(), c.end(), greater_than_ten )); + BOOST_CHECK ( v.size () == std::count_if ( c.begin(), it, is_even )); + BOOST_CHECK ( ba::all_of ( v.begin (), v.end (), is_even )); + } + { + std::vector v; + typename Container::const_iterator it = ba::copy_if_until ( + c, back_inserter ( v ), is_even, greater_than_ten).first; + BOOST_CHECK ( it == std::find_if ( c.begin(), c.end(), greater_than_ten )); + BOOST_CHECK ( v.size () == std::count_if ( c.begin(), it, is_even )); + BOOST_CHECK ( ba::all_of ( v.begin (), v.end (), is_even )); + } + } + template void test_copy_until ( Container const &c ) { @@ -224,8 +380,77 @@ BOOST_CXX14_CONSTEXPR inline bool constexpr_test_copy_until() { return res; } - - + +BOOST_CXX14_CONSTEXPR inline bool constexpr_test_copy_if_while() { + const int sz = 64; + int in_data[sz] = {0}; + bool res = true; + + const int* from = in_data; + const int* to = in_data + sz; + +// Terminate immediately + { + int out_data[sz] = {0}; + int* out = out_data; + out = ba::copy_if_while ( from, to, out, is_true, is_false ).second; + res = (res && out == out_data && ba::all_of(out, out + sz, is_zero)); + } +// Copy nothing + { + int out_data[sz] = {0}; + int* out = out_data; + out = ba::copy_if_while ( from, to, out, is_false, is_true ).second; + res = (res && out == out_data && ba::all_of(out, out + sz, is_zero)); + } +// Copy everything + { + int out_data[sz] = {0}; + int* out = out_data; + out = ba::copy_if_while ( from, to, out, is_true, is_true ).second; + res = (res && out == out_data + sz + && ba::equal( input_iterator(out_data), input_iterator(out_data + sz), + input_iterator(from), input_iterator(to))); + } + + return res; + } + +BOOST_CXX14_CONSTEXPR inline bool constexpr_test_copy_if_until() { + const int sz = 64; + int in_data[sz] = {0}; + bool res = true; + + const int* from = in_data; + const int* to = in_data + sz; + +// Terminate immediately + { + int out_data[sz] = {0}; + int* out = out_data; + out = ba::copy_if_until ( from, to, out, is_true, is_true ).second; + res = (res && out == out_data && ba::all_of(out, out + sz, is_zero)); + } +// Copy nothing + { + int out_data[sz] = {0}; + int* out = out_data; + out = ba::copy_if_until ( from, to, out, is_false, is_false ).second; + res = (res && out == out_data && ba::all_of(out, out + sz, is_zero)); + } +// Copy everything + { + int out_data[sz] = {0}; + int* out = out_data; + out = ba::copy_if_until ( from, to, out, is_true, is_false ).second; + res = (res && out == out_data + sz + && ba::equal( input_iterator(out_data), input_iterator(out_data + sz), + input_iterator(from), input_iterator(to))); + } + + return res; + } + void test_sequence1 () { std::vector v; for ( int i = 5; i < 15; ++i ) @@ -233,20 +458,26 @@ void test_sequence1 () { test_copy_if ( v ); test_copy_while ( v ); test_copy_until ( v ); - + BOOST_CXX14_CONSTEXPR bool constexpr_res_if = constexpr_test_copy_if(); BOOST_CHECK ( constexpr_res_if ); BOOST_CXX14_CONSTEXPR bool constexpr_res_while = constexpr_test_copy_while(); BOOST_CHECK ( constexpr_res_while ); BOOST_CXX14_CONSTEXPR bool constexpr_res_until = constexpr_test_copy_until(); BOOST_CHECK ( constexpr_res_until ); - + BOOST_CXX14_CONSTEXPR bool constexpr_res_if_while = constexpr_test_copy_if_while(); + BOOST_CHECK ( constexpr_res_if_while ); + BOOST_CXX14_CONSTEXPR bool constexpr_res_if_until = constexpr_test_copy_if_until(); + BOOST_CHECK ( constexpr_res_if_until ); + std::list l; for ( int i = 25; i > 15; --i ) l.push_back ( i ); test_copy_if ( l ); test_copy_while ( l ); test_copy_until ( l ); + test_copy_if_while ( l ); + test_copy_if_until ( l ); } From 6931736390bad7b2493c9cd38c447e72dab4e038 Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Fri, 1 Jul 2022 12:43:47 -0700 Subject: [PATCH 37/63] Fix broken doc build; create new section --- doc/algorithm.qbk | 49 ++++++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/doc/algorithm.qbk b/doc/algorithm.qbk index 88988fe45..02a156236 100644 --- a/doc/algorithm.qbk +++ b/doc/algorithm.qbk @@ -121,6 +121,35 @@ Transform each element in a range then combine adjacent elements to create an ou [endsect:CXX17] +[section:Copy Variations on Copy] +[section:variations_on_copy] + +[section:copy_until copy_until ] +[*[^[link header.boost.algorithm.cxx11.copy_if_hpp copy_until] ] ] +Copy all the elements from the start of the input range to the output range until the predicate is satisfied +[endsect:copy_until] + +[section:copy_while copy_while ] +[*[^[link header.boost.algorithm.cxx11.copy_if_hpp copy_while] ] ] +Copy all the elements from the start of the input range to the output range while the predicate is satisfied +[endsect:copy_while] + +[section:copy_if_until copy_if_until ] +[*[^[link header.boost.algorithm.cxx11.copy_if_hpp copy_if_until ] ] +Copy all elements that satisfy the element predicate from the start of the input range to the output range until the termination predicate is satisfied + +[endsect:copy_if_until] + +[section:copy_if_while copy_if_while ] +[*[^[link header.boost.algorithm.cxx11.copy_if_hpp copy_if_while ] ] +Copy all elements that satisfy the element predicate from the start of the input range to the output range while the termination predicate is satisfied + +[endsect:copy_if_while] + +[endsect:variations_on_copy] +[endsect:Copy] + + [section:Misc Other Algorithms] [section:misc_inner_algorithms] @@ -214,26 +243,6 @@ See below [include apply_permutation.qbk] -[section:copy_until copy_until ] -[*[^[link header.boost.algorithm.cxx11.copy_if_hpp copy_until] ] ] -Copy all the elements from the start of the input range to the output range until the predicate is satisfied -[endsect:copy_until] - -[section:copy_while copy_while ] -[*[^[link header.boost.algorithm.cxx11.copy_if_hpp copy_while] ] ] -Copy all the elements from the start of the input range to the output range while the predicate is satisfied -[endsect:copy_while] - -[section:copy_if_until copy_if_until ] -[*[^[link header.boost.algorithm.cxx11.copy_if_hpp copy_if_until ] ] -Copy all elements that satisfy the element predicate from the start of the input range to the output range until the termination predicate is satisfied -[endsect:copy_if_until] - -[section:copy_if_while copy_if_while ] -[*[^[link header.boost.algorithm.cxx11.copy_if_hpp copy_if_while ] ] -Copy all elements that satisfy the element predicate from the start of the input range to the output range while the termination predicate is satisfied -[endsect:copy_if_while] - [section:iota_n iota_n ] [*[^[link boost.algorithm.iota_n iota_n] ] ] Write a sequence of n increasing values to an output iterator From e8ba63c4ad8e73151b3c62197f6cbb1bee72477e Mon Sep 17 00:00:00 2001 From: fanquake Date: Tue, 30 Aug 2022 17:28:54 +0100 Subject: [PATCH 38/63] refactor: use core/enable_if over utility/enable_if --- include/boost/algorithm/algorithm.hpp | 2 +- include/boost/algorithm/clamp.hpp | 2 +- include/boost/algorithm/cxx11/is_permutation.hpp | 2 +- include/boost/algorithm/cxx11/is_sorted.hpp | 2 +- include/boost/algorithm/hex.hpp | 2 +- include/boost/algorithm/searching/boyer_moore.hpp | 2 +- include/boost/algorithm/searching/boyer_moore_horspool.hpp | 2 +- include/boost/algorithm/searching/knuth_morris_pratt.hpp | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/boost/algorithm/algorithm.hpp b/include/boost/algorithm/algorithm.hpp index 76753cd67..85b43c0ed 100644 --- a/include/boost/algorithm/algorithm.hpp +++ b/include/boost/algorithm/algorithm.hpp @@ -20,7 +20,7 @@ #include // for plus and multiplies #include -#include // for boost::disable_if +#include // for boost::disable_if #include namespace boost { namespace algorithm { diff --git a/include/boost/algorithm/clamp.hpp b/include/boost/algorithm/clamp.hpp index 1378f95b4..2f160a016 100644 --- a/include/boost/algorithm/clamp.hpp +++ b/include/boost/algorithm/clamp.hpp @@ -27,7 +27,7 @@ #include #include #include // for boost::type_identity -#include // for boost::disable_if +#include // for boost::disable_if namespace boost { namespace algorithm { diff --git a/include/boost/algorithm/cxx11/is_permutation.hpp b/include/boost/algorithm/cxx11/is_permutation.hpp index 31eac939d..693f54a49 100644 --- a/include/boost/algorithm/cxx11/is_permutation.hpp +++ b/include/boost/algorithm/cxx11/is_permutation.hpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include namespace boost { namespace algorithm { diff --git a/include/boost/algorithm/cxx11/is_sorted.hpp b/include/boost/algorithm/cxx11/is_sorted.hpp index e02fb3645..2526a8728 100644 --- a/include/boost/algorithm/cxx11/is_sorted.hpp +++ b/include/boost/algorithm/cxx11/is_sorted.hpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include // for boost::type_identity diff --git a/include/boost/algorithm/hex.hpp b/include/boost/algorithm/hex.hpp index 3cba2f958..f94580468 100644 --- a/include/boost/algorithm/hex.hpp +++ b/include/boost/algorithm/hex.hpp @@ -30,7 +30,7 @@ #include #include -#include +#include #include diff --git a/include/boost/algorithm/searching/boyer_moore.hpp b/include/boost/algorithm/searching/boyer_moore.hpp index 4bf76575e..80a5a4474 100644 --- a/include/boost/algorithm/searching/boyer_moore.hpp +++ b/include/boost/algorithm/searching/boyer_moore.hpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include diff --git a/include/boost/algorithm/searching/boyer_moore_horspool.hpp b/include/boost/algorithm/searching/boyer_moore_horspool.hpp index dd354cc54..b8038fd7f 100644 --- a/include/boost/algorithm/searching/boyer_moore_horspool.hpp +++ b/include/boost/algorithm/searching/boyer_moore_horspool.hpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include diff --git a/include/boost/algorithm/searching/knuth_morris_pratt.hpp b/include/boost/algorithm/searching/knuth_morris_pratt.hpp index 7c1541cc4..4c93ffff6 100644 --- a/include/boost/algorithm/searching/knuth_morris_pratt.hpp +++ b/include/boost/algorithm/searching/knuth_morris_pratt.hpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include From 6d58f2b9d1a8e377d407b6c68ec2b8d21a205301 Mon Sep 17 00:00:00 2001 From: Denis Mikhailov Date: Wed, 12 Oct 2022 19:53:19 +0600 Subject: [PATCH 39/63] Update is_palindrome.hpp --- include/boost/algorithm/is_palindrome.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/boost/algorithm/is_palindrome.hpp b/include/boost/algorithm/is_palindrome.hpp index 8e1df1811..531f82ecf 100644 --- a/include/boost/algorithm/is_palindrome.hpp +++ b/include/boost/algorithm/is_palindrome.hpp @@ -113,7 +113,7 @@ bool is_palindrome(const R& range, Predicate p) /// \note This function will return true for empty sequences and for palindromes. /// For other sequences function will return false. /// Complexity: O(N). -bool is_palindrome(const char* str) +inline bool is_palindrome(const char* str) { if(!str) return true; From 0666c4ce35ee0f91d2b0610a4617c1786c9ad9a7 Mon Sep 17 00:00:00 2001 From: Morwenn Date: Mon, 7 Nov 2022 16:44:05 +0100 Subject: [PATCH 40/63] Fix links to The Old New Thing Blogs moved from https://blogs.msdn.microsoft.com to https://devblogs.microsoft.com --- doc/apply_permutation.qbk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/apply_permutation.qbk b/doc/apply_permutation.qbk index 86bebf1e9..a71354808 100644 --- a/doc/apply_permutation.qbk +++ b/doc/apply_permutation.qbk @@ -16,12 +16,12 @@ The routine `apply_permutation` takes a item sequence and a order sequence. It r The routine `apply_reverse_permutation` takes a item sequence and a order sequence. It will reshuffle item sequence according to order sequence. Every value in order sequence means where the item goes to. Order sequence needs to be exactly a permutation of the sequence [0, 1, ... , N], where N is the biggest index in the item sequence (zero-indexed). Implementations are based on these articles: -https://blogs.msdn.microsoft.com/oldnewthing/20170102-00/?p=95095 -https://blogs.msdn.microsoft.com/oldnewthing/20170103-00/?p=95105 -https://blogs.msdn.microsoft.com/oldnewthing/20170104-00/?p=95115 -https://blogs.msdn.microsoft.com/oldnewthing/20170109-00/?p=95145 -https://blogs.msdn.microsoft.com/oldnewthing/20170110-00/?p=95155 -https://blogs.msdn.microsoft.com/oldnewthing/20170111-00/?p=95165 +https://devblogs.microsoft.com/oldnewthing/20170102-00/?p=95095 +https://devblogs.microsoft.com/oldnewthing/20170103-00/?p=95105 +https://devblogs.microsoft.com/oldnewthing/20170104-00/?p=95115 +https://devblogs.microsoft.com/oldnewthing/20170109-00/?p=95145 +https://devblogs.microsoft.com/oldnewthing/20170110-00/?p=95155 +https://devblogs.microsoft.com/oldnewthing/20170111-00/?p=95165 The routines come in 2 forms; the first one takes two iterators to define the item range and one iterator to define the beginning of index range. The second form takes range to define the item sequence and range to define index sequence. From e4d4a685da9617461940dea063cb7155ee339f13 Mon Sep 17 00:00:00 2001 From: Marcel Raad Date: Tue, 19 Jul 2016 10:23:33 +0200 Subject: [PATCH 41/63] Fix MSVC warnings in tests MSVC complains about narrowing conversions and unreferences parameters. This makes all tests almost level 4 warning clean on MSVC 14. --- test/copy_if_test1.cpp | 4 ++-- test/hex_test4.cpp | 18 +++++++++--------- test/is_permutation_test1.cpp | 2 +- test/search_test1.cpp | 14 +++++++------- test/search_test2.cpp | 4 ++-- test/search_test3.cpp | 4 ++-- test/search_test4.cpp | 4 ++-- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/test/copy_if_test1.cpp b/test/copy_if_test1.cpp index 574a17528..750b7057e 100644 --- a/test/copy_if_test1.cpp +++ b/test/copy_if_test1.cpp @@ -28,8 +28,8 @@ namespace ba = boost::algorithm; // namespace ba = boost; -BOOST_CXX14_CONSTEXPR bool is_true ( int v ) { return true; } -BOOST_CXX14_CONSTEXPR bool is_false ( int v ) { return false; } +BOOST_CXX14_CONSTEXPR bool is_true ( int ) { return true; } +BOOST_CXX14_CONSTEXPR bool is_false ( int ) { return false; } BOOST_CXX14_CONSTEXPR bool is_even ( int v ) { return v % 2 == 0; } BOOST_CXX14_CONSTEXPR bool is_odd ( int v ) { return v % 2 == 1; } BOOST_CXX14_CONSTEXPR bool is_zero ( int v ) { return v == 0; } diff --git a/test/hex_test4.cpp b/test/hex_test4.cpp index ba1ee341c..19abb4e36 100644 --- a/test/hex_test4.cpp +++ b/test/hex_test4.cpp @@ -25,7 +25,7 @@ void test_short_input1 () { std::string s; try { ba::unhex ( std::string ( "A" ), std::back_inserter(s)); } - catch ( const std::exception &ex ) { return; } + catch ( const std::exception & ) { return; } BOOST_TEST_MESSAGE ( "Failed to catch std::exception in test_short_input1" ); BOOST_CHECK ( false ); } @@ -34,7 +34,7 @@ void test_short_input2 () { std::string s; try { ba::unhex ( std::string ( "A" ), std::back_inserter(s)); } - catch ( const ba::hex_decode_error &ex ) { return; } + catch ( const ba::hex_decode_error & ) { return; } BOOST_TEST_MESSAGE ( "Failed to catch ba::hex_decode_error in test_short_input2" ); BOOST_CHECK ( false ); } @@ -43,7 +43,7 @@ void test_short_input3 () { std::string s; try { ba::unhex ( std::string ( "A" ), std::back_inserter(s)); } - catch ( const ba::not_enough_input &ex ) { return; } + catch ( const ba::not_enough_input & ) { return; } BOOST_TEST_MESSAGE ( "Failed to catch ba::not_enough_input in test_short_input3" ); BOOST_CHECK ( false ); } @@ -53,8 +53,8 @@ void test_short_input4 () { std::string s; try { ba::unhex ( std::string ( "A" ), std::back_inserter(s)); } - catch ( const ba::non_hex_input &ex ) { BOOST_CHECK ( false ); } - catch ( const ba::not_enough_input &ex ) { return; } + catch ( const ba::non_hex_input & ) { BOOST_CHECK ( false ); } + catch ( const ba::not_enough_input & ) { return; } catch ( ... ) { BOOST_CHECK ( false ); } BOOST_CHECK ( false ); } @@ -64,8 +64,8 @@ void test_short_input5 () { std::string s; try { ba::unhex ( "A", std::back_inserter(s)); } - catch ( const ba::non_hex_input &ex ) { BOOST_CHECK ( false ); } - catch ( const ba::not_enough_input &ex ) { return; } + catch ( const ba::non_hex_input & ) { BOOST_CHECK ( false ); } + catch ( const ba::not_enough_input & ) { return; } catch ( ... ) { BOOST_CHECK ( false ); } BOOST_CHECK ( false ); } @@ -125,8 +125,8 @@ void test_nonhex_input4 () { std::string s; try { ba::unhex ( "P1234FA1234", std::back_inserter(s)); } - catch ( const ba::not_enough_input &ex ) { BOOST_CHECK ( false ); } - catch ( const ba::non_hex_input &ex ) { return; } + catch ( const ba::not_enough_input & ) { BOOST_CHECK ( false ); } + catch ( const ba::non_hex_input & ) { return; } catch ( ... ) { BOOST_CHECK ( false ); } BOOST_CHECK ( false ); } diff --git a/test/is_permutation_test1.cpp b/test/is_permutation_test1.cpp index 2e1a12f35..85cf806ee 100644 --- a/test/is_permutation_test1.cpp +++ b/test/is_permutation_test1.cpp @@ -112,7 +112,7 @@ void test_sequence1 () { std::vector v, v1; v.clear (); - for ( std::size_t i = 5; i < 15; ++i ) + for ( int i = 5; i < 15; ++i ) v.push_back ( i ); v1 = v; BOOST_CHECK ( ba::is_permutation ( v.begin (), v.end (), v.begin ())); // better be a permutation of itself! diff --git a/test/search_test1.cpp b/test/search_test1.cpp index 3fe3b91cd..8bcc5a7ef 100644 --- a/test/search_test1.cpp +++ b/test/search_test1.cpp @@ -32,7 +32,7 @@ namespace { // Check using iterators template - void check_one_iter ( const Container &haystack, const std::string &needle, int expected ) { + void check_one_iter ( const Container &haystack, const std::string &needle, std::ptrdiff_t expected ) { typedef typename Container::const_iterator iter_type; typedef typename std::pair ret_type; typedef std::string::const_iterator pattern_type; @@ -53,7 +53,7 @@ namespace { // iter_type it1r = ret1r.first; // iter_type it2 = ret2.first; // iter_type it3 = ret3.first; - const int dist = ret1.first == hEnd ? -1 : std::distance ( hBeg, ret1.first ); + const std::ptrdiff_t dist = ret1.first == hEnd ? -1 : std::distance ( hBeg, ret1.first ); std::cout << "(Iterators) Pattern is " << needle.length () << ", haysstack is " << haystack.length () << " chars long; " << std::endl; try { @@ -97,7 +97,7 @@ namespace { // Check using pointers // We're assuming that the container implements contiguous storage here. template - void check_one_pointer ( const Container &haystack, const std::string &needle, int expected ) { + void check_one_pointer ( const Container &haystack, const std::string &needle, std::ptrdiff_t expected ) { typedef const typename Container::value_type *ptr_type; typedef typename std::pair ret_type; @@ -110,7 +110,7 @@ namespace { ret_type ret1 = ba::boyer_moore_search (hBeg, hEnd, nBeg, nEnd); ret_type ret2 = ba::boyer_moore_horspool_search (hBeg, hEnd, nBeg, nEnd); ret_type ret3 = ba::knuth_morris_pratt_search (hBeg, hEnd, nBeg, nEnd); - const int dist = ret1.first == hEnd ? -1 : std::distance ( hBeg, ret1.first ); + const std::ptrdiff_t dist = ret1.first == hEnd ? -1 : std::distance ( hBeg, ret1.first ); std::cout << "(Pointers) Pattern is " << needle.length () << ", haysstack is " << haystack.length () << " chars long; " << std::endl; try { @@ -147,7 +147,7 @@ namespace { // Check using objects template - void check_one_object ( const Container &haystack, const std::string &needle, int expected ) { + void check_one_object ( const Container &haystack, const std::string &needle, std::ptrdiff_t expected ) { typedef typename Container::const_iterator iter_type; typedef typename std::pair ret_type; typedef std::string::const_iterator pattern_type; @@ -169,7 +169,7 @@ namespace { ret_type retr1r = bm_r (haystack); ret_type ret2 = bmh (hBeg, hEnd); ret_type ret3 = kmp (hBeg, hEnd); - const int dist = ret1.first == hEnd ? -1 : std::distance ( hBeg, ret1.first ); + const std::ptrdiff_t dist = ret1.first == hEnd ? -1 : std::distance ( hBeg, ret1.first ); std::cout << "(Objects) Pattern is " << needle.length () << ", haysstack is " << haystack.length () << " chars long; " << std::endl; try { @@ -224,7 +224,7 @@ namespace { template - void check_one ( const Container &haystack, const std::string &needle, int expected ) { + void check_one ( const Container &haystack, const std::string &needle, std::ptrdiff_t expected ) { check_one_iter ( haystack, needle, expected ); check_one_pointer ( haystack, needle, expected ); check_one_object ( haystack, needle, expected ); diff --git a/test/search_test2.cpp b/test/search_test2.cpp index eba105e9b..ae517cde4 100644 --- a/test/search_test2.cpp +++ b/test/search_test2.cpp @@ -85,7 +85,7 @@ namespace { std::cout << std::endl; } - void check_one ( const vec &haystack, const vec &needle, int expected ) { + void check_one ( const vec &haystack, const vec &needle, std::ptrdiff_t expected ) { std::size_t i; std::clock_t sTime; unsigned long stdDiff; @@ -147,7 +147,7 @@ BOOST_AUTO_TEST_CASE( test_main ) std::cout << "---- Middle -----" << std::endl; check_one ( c1, p1f, -2 ); // Don't know answer std::cout << "------ End ------" << std::endl; - check_one ( c1, p1e, c1.size() - p1e.size ()); + check_one ( c1, p1e, static_cast(c1.size() - p1e.size ())); std::cout << "--- Not found ---" << std::endl; check_one ( c1, p1n, -1 ); // Not found } diff --git a/test/search_test3.cpp b/test/search_test3.cpp index e4c766185..cac7499d4 100644 --- a/test/search_test3.cpp +++ b/test/search_test3.cpp @@ -85,7 +85,7 @@ namespace { std::cout << std::endl; } - void check_one ( const vec &haystack, const vec &needle, int expected ) { + void check_one ( const vec &haystack, const vec &needle, std::ptrdiff_t expected ) { std::size_t i; std::clock_t sTime; unsigned long stdDiff; @@ -147,7 +147,7 @@ BOOST_AUTO_TEST_CASE( test_main ) std::cout << "---- Middle -----" << std::endl; check_one ( c1, p1f, -2 ); // Don't know answer std::cout << "------ End ------" << std::endl; - check_one ( c1, p1e, c1.size() - p1e.size ()); + check_one ( c1, p1e, static_cast(c1.size() - p1e.size ())); std::cout << "--- Not found ---" << std::endl; check_one ( c1, p1n, -1 ); // Not found } diff --git a/test/search_test4.cpp b/test/search_test4.cpp index 997e35907..0916508b0 100644 --- a/test/search_test4.cpp +++ b/test/search_test4.cpp @@ -62,7 +62,7 @@ namespace { return retVal; } - void check_one ( const vec &haystack, const vec &needle, int expected ) { + void check_one ( const vec &haystack, const vec &needle, std::ptrdiff_t expected ) { std::pair res; std::pair exp; // the expected result @@ -117,7 +117,7 @@ BOOST_AUTO_TEST_CASE( test_main ) std::cout << "---- Middle -----" << std::endl; check_one ( c1, p1f, -2 ); // Don't know answer std::cout << "------ End ------" << std::endl; - check_one ( c1, p1e, c1.size() - p1e.size ()); + check_one ( c1, p1e, static_cast(c1.size() - p1e.size ())); std::cout << "--- Not found ---" << std::endl; check_one ( c1, p1n, -1 ); // Not found } From 1d9706feb796e955aabf115051ef91676a417fb6 Mon Sep 17 00:00:00 2001 From: glywk Date: Sat, 21 Jan 2023 00:42:52 +0100 Subject: [PATCH 42/63] Add is_blank classifier --- .../boost/algorithm/string/classification.hpp | 19 +++++++++++++++++++ string/doc/quickref.xml | 7 +++++++ string/test/predicate_test.cpp | 6 +++++- 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/include/boost/algorithm/string/classification.hpp b/include/boost/algorithm/string/classification.hpp index ca43602d4..83cdca529 100644 --- a/include/boost/algorithm/string/classification.hpp +++ b/include/boost/algorithm/string/classification.hpp @@ -85,6 +85,22 @@ namespace boost { return detail::is_classifiedF(std::ctype_base::alpha, Loc); } +#ifndef BOOST_NO_CXX11 + //! is_blank predicate + /*! + Construct the \c is_classified predicate for the \c ctype_base::blank category. + + \param Loc A locale used for classification + \return An instance of the \c is_classified predicate + \since c++11 + */ + inline detail::is_classifiedF + is_blank(const std::locale& Loc=std::locale()) + { + return detail::is_classifiedF(std::ctype_base::blank, Loc); + } +#endif + //! is_cntrl predicate /*! Construct the \c is_classified predicate for the \c ctype_base::cntrl category. @@ -294,6 +310,9 @@ namespace boost { // pull names to the boost namespace using algorithm::is_classified; using algorithm::is_space; +#ifndef BOOST_NO_CXX11 + using algorithm::is_blank; +#endif using algorithm::is_alnum; using algorithm::is_alpha; using algorithm::is_cntrl; diff --git a/string/doc/quickref.xml b/string/doc/quickref.xml index fe267e718..39a224b70 100644 --- a/string/doc/quickref.xml +++ b/string/doc/quickref.xml @@ -667,6 +667,13 @@ is_space() + + is_blank + Recognize blanks + + is_blank() + + is_alnum Recognize alphanumeric characters diff --git a/string/test/predicate_test.cpp b/string/test/predicate_test.cpp index ba1564e53..bc16e7bfa 100644 --- a/string/test/predicate_test.cpp +++ b/string/test/predicate_test.cpp @@ -138,7 +138,11 @@ void classification_test() TEST_CLASS( is_any_of( string("abc") ), "aaabbcc", "aaxb" ); TEST_CLASS( is_any_of( "abc" ), "aaabbcc", "aaxb" ); TEST_CLASS( is_from_range( 'a', 'c' ), "aaabbcc", "aaxb" ); - + +#ifndef BOOST_NO_CXX11 + TEST_CLASS( is_blank(), " \t", "\t \n\r" ); +#endif + TEST_CLASS( !is_classified(std::ctype_base::space), "...", "..\n\r\t " ); TEST_CLASS( ( !is_any_of("abc") && is_from_range('a','e') ) || is_space(), "d e", "abcde" ); From d1ecc8b0a8c8e6a8d8e15e2f28487485f2c7b3e1 Mon Sep 17 00:00:00 2001 From: jiayuehua <3423893+jiayuehua@users.noreply.github.com> Date: Mon, 8 May 2023 11:06:15 +0800 Subject: [PATCH 43/63] fix range-base gather algorithm --- include/boost/algorithm/gather.hpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/boost/algorithm/gather.hpp b/include/boost/algorithm/gather.hpp index e777f8bd1..00f173397 100644 --- a/include/boost/algorithm/gather.hpp +++ b/include/boost/algorithm/gather.hpp @@ -1,4 +1,4 @@ -/* +/* Copyright 2008 Adobe Systems Incorporated Distributed under the Boost Software License, Version 1.0. (See accompanying @@ -84,7 +84,7 @@ namespace boost { namespace algorithm { template < typename BidirectionalIterator, // models BidirectionalIterator typename Pred> // models UnaryPredicate -std::pair gather +std::pair gather ( BidirectionalIterator first, BidirectionalIterator last, BidirectionalIterator pivot, Pred pred ) { // The first call partitions everything up to (but not including) the pivot element, @@ -106,11 +106,11 @@ template < typename BidirectionalRange, // typename Pred> // Pred models UnaryPredicate std::pair< - typename boost::range_iterator::type, - typename boost::range_iterator::type> + typename boost::range_iterator::type, + typename boost::range_iterator::type> gather ( - const BidirectionalRange &range, - typename boost::range_iterator::type pivot, + BidirectionalRange &range, + typename boost::range_iterator::type pivot, Pred pred ) { return boost::algorithm::gather ( boost::begin ( range ), boost::end ( range ), pivot, pred ); From 3401f0398fc7417a1db470a37db8fa151cf83be9 Mon Sep 17 00:00:00 2001 From: jiayuehua <3423893+jiayuehua@users.noreply.github.com> Date: Mon, 8 May 2023 11:06:15 +0800 Subject: [PATCH 44/63] fix range-base gather algorithm --- include/boost/algorithm/gather.hpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/boost/algorithm/gather.hpp b/include/boost/algorithm/gather.hpp index e777f8bd1..00f173397 100644 --- a/include/boost/algorithm/gather.hpp +++ b/include/boost/algorithm/gather.hpp @@ -1,4 +1,4 @@ -/* +/* Copyright 2008 Adobe Systems Incorporated Distributed under the Boost Software License, Version 1.0. (See accompanying @@ -84,7 +84,7 @@ namespace boost { namespace algorithm { template < typename BidirectionalIterator, // models BidirectionalIterator typename Pred> // models UnaryPredicate -std::pair gather +std::pair gather ( BidirectionalIterator first, BidirectionalIterator last, BidirectionalIterator pivot, Pred pred ) { // The first call partitions everything up to (but not including) the pivot element, @@ -106,11 +106,11 @@ template < typename BidirectionalRange, // typename Pred> // Pred models UnaryPredicate std::pair< - typename boost::range_iterator::type, - typename boost::range_iterator::type> + typename boost::range_iterator::type, + typename boost::range_iterator::type> gather ( - const BidirectionalRange &range, - typename boost::range_iterator::type pivot, + BidirectionalRange &range, + typename boost::range_iterator::type pivot, Pred pred ) { return boost::algorithm::gather ( boost::begin ( range ), boost::end ( range ), pivot, pred ); From dc14b69189ae91ffb6bbbe96c60a9e3cdd41ab96 Mon Sep 17 00:00:00 2001 From: glywk Date: Thu, 27 Jul 2023 23:15:48 +0200 Subject: [PATCH 45/63] Add negative is_blank predicate tests --- string/test/predicate_test.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/string/test/predicate_test.cpp b/string/test/predicate_test.cpp index bc16e7bfa..2e1ebd7a6 100644 --- a/string/test/predicate_test.cpp +++ b/string/test/predicate_test.cpp @@ -141,6 +141,7 @@ void classification_test() #ifndef BOOST_NO_CXX11 TEST_CLASS( is_blank(), " \t", "\t \n\r" ); + TEST_CLASS( !is_blank(), "abc\n\v\f\r", "a x\t" ); #endif TEST_CLASS( !is_classified(std::ctype_base::space), "...", "..\n\r\t " ); From 6b1d2fc5ad97044496a43a1d0019f7ba9eca60e6 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 11 Mar 2024 08:27:02 -0500 Subject: [PATCH 46/63] Make the library modular usable. --- Jamfile | 11 ----------- build.jam | 36 ++++++++++++++++++++++++++++++++++++ example/Jamfile.v2 | 3 +-- minmax/test/Jamfile.v2 | 2 +- string/test/Jamfile.v2 | 2 +- test/Jamfile.v2 | 2 +- 6 files changed, 40 insertions(+), 16 deletions(-) delete mode 100644 Jamfile create mode 100644 build.jam diff --git a/Jamfile b/Jamfile deleted file mode 100644 index a2dbf99e6..000000000 --- a/Jamfile +++ /dev/null @@ -1,11 +0,0 @@ -# Boost.Algorithm Library Jamfile -# -# Copyright (c) 2018 James E. King III -# -# Use, modification, and distribution are subject to 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) - -# please order by name to ease maintenance -build-project example ; -build-project test ; diff --git a/build.jam b/build.jam new file mode 100644 index 000000000..f62e633e3 --- /dev/null +++ b/build.jam @@ -0,0 +1,36 @@ +# Copyright René Ferdinand Rivera Morell 2023 +# 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) + +import project ; + +project /boost/algorithm + : common-requirements + /boost/array//boost_array + /boost/assert//boost_assert + /boost/bind//boost_bind + /boost/concept_check//boost_concept_check + /boost/config//boost_config + /boost/core//boost_core + /boost/exception//boost_exception + /boost/function//boost_function + /boost/iterator//boost_iterator + /boost/mpl//boost_mpl + /boost/range//boost_range + /boost/regex//boost_regex + /boost/static_assert//boost_static_assert + /boost/throw_exception//boost_throw_exception + /boost/tuple//boost_tuple + /boost/type_traits//boost_type_traits + /boost/unordered//boost_unordered + include + ; + +explicit + [ alias boost_algorithm ] + [ alias all : boost_algorithm example test string/example string/test ] + ; + +call-if : boost-library algorithm + ; diff --git a/example/Jamfile.v2 b/example/Jamfile.v2 index 64a405559..96163b68c 100644 --- a/example/Jamfile.v2 +++ b/example/Jamfile.v2 @@ -8,9 +8,8 @@ # See http://www.boost.org for updates, documentation, and revision history. -project /boost/algorithm/example +project : requirements - ../../../ speed msvc:_SCL_SECURE_NO_WARNINGS msvc:NOMINMAX diff --git a/minmax/test/Jamfile.v2 b/minmax/test/Jamfile.v2 index 384b35929..2e41d1ea1 100644 --- a/minmax/test/Jamfile.v2 +++ b/minmax/test/Jamfile.v2 @@ -11,7 +11,7 @@ import testing ; alias unit_test_framework : # sources - /boost//unit_test_framework + /boost/test//unit_test_framework ; { diff --git a/string/test/Jamfile.v2 b/string/test/Jamfile.v2 index 7f60df703..8e53f336c 100644 --- a/string/test/Jamfile.v2 +++ b/string/test/Jamfile.v2 @@ -11,7 +11,7 @@ import testing ; alias unit_test_framework : # sources - /boost//unit_test_framework + /boost/test//unit_test_framework ; test-suite algorithm/string diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index aef6bdb38..9c8d199ae 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -11,7 +11,7 @@ import testing ; alias unit_test_framework : # sources - /boost//unit_test_framework + /boost/test//unit_test_framework ; From fcf95e504bffcadfabb5f4159992a240423dfa5d Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 29 Mar 2024 21:12:36 -0500 Subject: [PATCH 47/63] Switch to library requirements instead of source. As source puts extra source in install targets. --- build.jam | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/build.jam b/build.jam index f62e633e3..91d63001b 100644 --- a/build.jam +++ b/build.jam @@ -7,23 +7,23 @@ import project ; project /boost/algorithm : common-requirements - /boost/array//boost_array - /boost/assert//boost_assert - /boost/bind//boost_bind - /boost/concept_check//boost_concept_check - /boost/config//boost_config - /boost/core//boost_core - /boost/exception//boost_exception - /boost/function//boost_function - /boost/iterator//boost_iterator - /boost/mpl//boost_mpl - /boost/range//boost_range - /boost/regex//boost_regex - /boost/static_assert//boost_static_assert - /boost/throw_exception//boost_throw_exception - /boost/tuple//boost_tuple - /boost/type_traits//boost_type_traits - /boost/unordered//boost_unordered + /boost/array//boost_array + /boost/assert//boost_assert + /boost/bind//boost_bind + /boost/concept_check//boost_concept_check + /boost/config//boost_config + /boost/core//boost_core + /boost/exception//boost_exception + /boost/function//boost_function + /boost/iterator//boost_iterator + /boost/mpl//boost_mpl + /boost/range//boost_range + /boost/regex//boost_regex + /boost/static_assert//boost_static_assert + /boost/throw_exception//boost_throw_exception + /boost/tuple//boost_tuple + /boost/type_traits//boost_type_traits + /boost/unordered//boost_unordered include ; From 14922e71c0faa4cda5ca9bfcc5cd7968fcda1b22 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 13 Apr 2024 11:15:55 -0500 Subject: [PATCH 48/63] Avoid global references to boost-root. --- doc/Jamfile.v2 | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2 index bc67f7def..4d3319af0 100644 --- a/doc/Jamfile.v2 +++ b/doc/Jamfile.v2 @@ -16,18 +16,18 @@ using quickbook ; using doxygen ; using boostbook ; -doxygen autodoc - : - [ glob ../../../boost/algorithm/*.hpp - ../../../boost/algorithm/searching/*.hpp - ../../../boost/algorithm/cxx11/*.hpp - ../../../boost/algorithm/cxx14/*.hpp - ../../../boost/algorithm/cxx17/*.hpp +doxygen autodoc + : + [ glob ../include/boost/algorithm/*.hpp + ../include/boost/algorithm/searching/*.hpp + ../include/boost/algorithm/cxx11/*.hpp + ../include/boost/algorithm/cxx14/*.hpp + ../include/boost/algorithm/cxx17/*.hpp ] - : + : "PREDEFINED=\"BOOST_ALGORITHM_DOXYGEN=1\"" WARNINGS=YES # Default NO, but useful to see warnings, especially in a logfile. - ; + ; xml algorithm : algorithm.qbk ; @@ -36,7 +36,7 @@ boostbook standalone : algorithm : - autodoc + autodoc boost.root=../../../.. "boost.doxygen.reftitle=Boost.Algorithms C++ Reference" chapter.autolabel=0 From b3b2ff4d0ce8fe35bf84cffada5345c8588c2b24 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 13 Apr 2024 16:18:29 -0500 Subject: [PATCH 49/63] Remove relative references to boost-root in Jamfiles. --- string/doc/Jamfile.v2 | 58 +++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/string/doc/Jamfile.v2 b/string/doc/Jamfile.v2 index 9ddebb8b6..58fc21430 100644 --- a/string/doc/Jamfile.v2 +++ b/string/doc/Jamfile.v2 @@ -10,40 +10,40 @@ import toolset ; toolset.using doxygen ; -boostbook string_algo : string_algo.xml autodoc +boostbook string_algo : string_algo.xml autodoc : boost.root=../../../../.. pdf:boost.url.prefix=http://www.boost.org/doc/libs/release/doc/html ; doxygen autodoc - : - [ glob ../../../../boost/algorithm/string.hpp ] - [ glob ../../../../boost/algorithm/string_regex.hpp ] - - [ glob ../../../../boost/algorithm/string/classification.hpp ] - [ glob ../../../../boost/algorithm/string/iterator_range.hpp ] - [ glob ../../../../boost/algorithm/string/sequence_traits.hpp ] - [ glob ../../../../boost/algorithm/string/std_containers_traits.hpp ] - [ glob ../../../../boost/algorithm/string/concept.hpp ] - [ glob ../../../../boost/algorithm/string/compare.hpp ] - [ glob ../../../../boost/algorithm/string/constants.hpp ] - [ glob ../../../../boost/algorithm/string/case_conv.hpp ] - [ glob ../../../../boost/algorithm/string/find.hpp ] - [ glob ../../../../boost/algorithm/string/finder.hpp ] - [ glob ../../../../boost/algorithm/string/find_iterator.hpp ] - [ glob ../../../../boost/algorithm/string/trim.hpp ] - [ glob ../../../../boost/algorithm/string/predicate.hpp ] - [ glob ../../../../boost/algorithm/string/split.hpp ] - [ glob ../../../../boost/algorithm/string/iter_find.hpp ] - [ glob ../../../../boost/algorithm/string/erase.hpp ] - [ glob ../../../../boost/algorithm/string/join.hpp ] - [ glob ../../../../boost/algorithm/string/replace.hpp ] - [ glob ../../../../boost/algorithm/string/find_format.hpp ] - [ glob ../../../../boost/algorithm/string/formatter.hpp ] - [ glob ../../../../boost/algorithm/string/regex.hpp ] - [ glob ../../../../boost/algorithm/string/regex_find_format.hpp ] - [ glob ../../../../boost/algorithm/string/trim_all.hpp ] + : + [ glob ../../include/boost/algorithm/string.hpp ] + [ glob ../../include/boost/algorithm/string_regex.hpp ] + + [ glob ../../include/boost/algorithm/string/classification.hpp ] + [ glob ../../include/boost/algorithm/string/iterator_range.hpp ] + [ glob ../../include/boost/algorithm/string/sequence_traits.hpp ] + [ glob ../../include/boost/algorithm/string/std_containers_traits.hpp ] + [ glob ../../include/boost/algorithm/string/concept.hpp ] + [ glob ../../include/boost/algorithm/string/compare.hpp ] + [ glob ../../include/boost/algorithm/string/constants.hpp ] + [ glob ../../include/boost/algorithm/string/case_conv.hpp ] + [ glob ../../include/boost/algorithm/string/find.hpp ] + [ glob ../../include/boost/algorithm/string/finder.hpp ] + [ glob ../../include/boost/algorithm/string/find_iterator.hpp ] + [ glob ../../include/boost/algorithm/string/trim.hpp ] + [ glob ../../include/boost/algorithm/string/predicate.hpp ] + [ glob ../../include/boost/algorithm/string/split.hpp ] + [ glob ../../include/boost/algorithm/string/iter_find.hpp ] + [ glob ../../include/boost/algorithm/string/erase.hpp ] + [ glob ../../include/boost/algorithm/string/join.hpp ] + [ glob ../../include/boost/algorithm/string/replace.hpp ] + [ glob ../../include/boost/algorithm/string/find_format.hpp ] + [ glob ../../include/boost/algorithm/string/formatter.hpp ] + [ glob ../../include/boost/algorithm/string/regex.hpp ] + [ glob ../../include/boost/algorithm/string/regex_find_format.hpp ] + [ glob ../../include/boost/algorithm/string/trim_all.hpp ] : HIDE_UNDOC_MEMBERS=YES EXTRACT_PRIVATE=NO @@ -53,7 +53,7 @@ doxygen autodoc SEARCH_INCLUDES=YES PREDEFINED="BOOST_STRING_TYPENAME=typename \"BOOST_STATIC_CONSTANT(type,var)=static const type var;\"" ; - + From 1213b9fd1f875ea2752b74844e88e40b3f7828f9 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 5 May 2024 09:00:00 -0500 Subject: [PATCH 50/63] Add requires-b2 check to top-level build file. --- build.jam | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.jam b/build.jam index 91d63001b..d72c8dda9 100644 --- a/build.jam +++ b/build.jam @@ -3,6 +3,8 @@ # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) +require-b2 5.1 ; + import project ; project /boost/algorithm From c63c45a932fb1e4fbfea2066b79282d7ff00724e Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 14 Jun 2024 11:33:55 -0500 Subject: [PATCH 51/63] Bump B2 require to 5.2 --- build.jam | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/build.jam b/build.jam index d72c8dda9..d5b9263dc 100644 --- a/build.jam +++ b/build.jam @@ -3,9 +3,7 @@ # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) -require-b2 5.1 ; - -import project ; +require-b2 5.2 ; project /boost/algorithm : common-requirements From 8189606c93b5bd4d136a9a9d9e6459fbe8b73fee Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 22:52:03 -0500 Subject: [PATCH 52/63] Update copyright dates. --- build.jam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.jam b/build.jam index d5b9263dc..e8ae15d6f 100644 --- a/build.jam +++ b/build.jam @@ -1,4 +1,4 @@ -# Copyright René Ferdinand Rivera Morell 2023 +# 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) From 81e46297b55f37fdf9e6a14a3d125820b4a7a69e Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 23 Jul 2024 22:34:22 -0500 Subject: [PATCH 53/63] Move inter-lib dependencies to a project variable and into the build targets. --- build.jam | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/build.jam b/build.jam index e8ae15d6f..6aac487e3 100644 --- a/build.jam +++ b/build.jam @@ -5,32 +5,35 @@ require-b2 5.2 ; +constant boost_dependencies : + /boost/array//boost_array + /boost/assert//boost_assert + /boost/bind//boost_bind + /boost/concept_check//boost_concept_check + /boost/config//boost_config + /boost/core//boost_core + /boost/exception//boost_exception + /boost/function//boost_function + /boost/iterator//boost_iterator + /boost/mpl//boost_mpl + /boost/range//boost_range + /boost/regex//boost_regex + /boost/static_assert//boost_static_assert + /boost/throw_exception//boost_throw_exception + /boost/tuple//boost_tuple + /boost/type_traits//boost_type_traits + /boost/unordered//boost_unordered ; + project /boost/algorithm : common-requirements - /boost/array//boost_array - /boost/assert//boost_assert - /boost/bind//boost_bind - /boost/concept_check//boost_concept_check - /boost/config//boost_config - /boost/core//boost_core - /boost/exception//boost_exception - /boost/function//boost_function - /boost/iterator//boost_iterator - /boost/mpl//boost_mpl - /boost/range//boost_range - /boost/regex//boost_regex - /boost/static_assert//boost_static_assert - /boost/throw_exception//boost_throw_exception - /boost/tuple//boost_tuple - /boost/type_traits//boost_type_traits - /boost/unordered//boost_unordered include ; explicit - [ alias boost_algorithm ] + [ alias boost_algorithm : : : : $(boost_dependencies) ] [ alias all : boost_algorithm example test string/example string/test ] ; call-if : boost-library algorithm ; + From 0c0e84b112d8e8b57c29bc56bcb9f8b6689c3597 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 27 Jul 2024 10:28:38 -0500 Subject: [PATCH 54/63] Adjust self dependencies as inter-lib deps no longer apply globally. --- build.jam | 7 +++++-- example/Jamfile.v2 | 1 + minmax/example/Jamfile | 2 ++ minmax/test/Jamfile.v2 | 6 ++++-- string/example/Jamfile | 1 + string/test/Jamfile.v2 | 22 ++++++++++++---------- test/Jamfile.v2 | 4 +++- 7 files changed, 28 insertions(+), 15 deletions(-) diff --git a/build.jam b/build.jam index 6aac487e3..49099290d 100644 --- a/build.jam +++ b/build.jam @@ -31,9 +31,12 @@ project /boost/algorithm explicit [ alias boost_algorithm : : : : $(boost_dependencies) ] - [ alias all : boost_algorithm example test string/example string/test ] + [ alias all : boost_algorithm test + example + minmax/example minmax/test + string/example string/test + ] ; call-if : boost-library algorithm ; - diff --git a/example/Jamfile.v2 b/example/Jamfile.v2 index 96163b68c..ce3eca301 100644 --- a/example/Jamfile.v2 +++ b/example/Jamfile.v2 @@ -10,6 +10,7 @@ project : requirements + /boost/algorithm//boost_algorithm speed msvc:_SCL_SECURE_NO_WARNINGS msvc:NOMINMAX diff --git a/minmax/example/Jamfile b/minmax/example/Jamfile index d8650e042..56d771de6 100644 --- a/minmax/example/Jamfile +++ b/minmax/example/Jamfile @@ -7,6 +7,8 @@ # http://www.boost.org/LICENSE_1_0.txt) # +project : requirements /boost/algorithm//boost_algorithm ; + exe minmax_ex : minmax_ex.cpp ; exe minmax_timer : minmax_timer.cpp ; diff --git a/minmax/test/Jamfile.v2 b/minmax/test/Jamfile.v2 index 2e41d1ea1..cdc468cb8 100644 --- a/minmax/test/Jamfile.v2 +++ b/minmax/test/Jamfile.v2 @@ -9,17 +9,19 @@ import testing ; +project : requirements /boost/algorithm//boost_algorithm ; + alias unit_test_framework : # sources /boost/test//unit_test_framework - ; + ; { test-suite algorithm/minmax : [ run minmax_element_test.cpp unit_test_framework : : : : minmax_element ] [ run minmax_test.cpp unit_test_framework - : : : : minmax ] + : : : : minmax ] ; } diff --git a/string/example/Jamfile b/string/example/Jamfile index 74c923f8b..4cbe09d3d 100644 --- a/string/example/Jamfile +++ b/string/example/Jamfile @@ -7,6 +7,7 @@ # # See http://www.boost.org for updates, documentation, and revision history. +project : requirements /boost/algorithm//boost_algorithm ; exe conv_example : conv_example.cpp ; exe predicate_example : predicate_example.cpp ; diff --git a/string/test/Jamfile.v2 b/string/test/Jamfile.v2 index 8e53f336c..adbb275d1 100644 --- a/string/test/Jamfile.v2 +++ b/string/test/Jamfile.v2 @@ -9,31 +9,33 @@ import testing ; +project : requirements /boost/algorithm//boost_algorithm ; + alias unit_test_framework : # sources /boost/test//unit_test_framework - ; + ; test-suite algorithm/string - : [ run + : [ run trim_test.cpp unit_test_framework : : : : trim ] - [ run + [ run conv_test.cpp unit_test_framework : : : : conv ] - [ run + [ run predicate_test.cpp unit_test_framework : : : : predicate ] - [ run + [ run find_test.cpp unit_test_framework : : : @@ -51,23 +53,23 @@ test-suite algorithm/string : : join ] - [ run + [ run replace_test.cpp unit_test_framework : : : : replace ] - [ run + [ run regex_test.cpp unit_test_framework ../../../regex/build//boost_regex : : - : + : : regex ] - [ run + [ run find_format_test.cpp unit_test_framework : : - : + : : find_format ] ; diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 9c8d199ae..581abff34 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -9,6 +9,8 @@ import testing ; +project : requirements /boost/algorithm//boost_algorithm ; + alias unit_test_framework : # sources /boost/test//unit_test_framework @@ -85,7 +87,7 @@ alias unit_test_framework # Is_partitioned_until tests [ run is_partitioned_until_test.cpp unit_test_framework : : : : is_partitioned_until_test ] - + # Apply_permutation tests [ run apply_permutation_test.cpp unit_test_framework : : : : apply_permutation_test ] # Find tests From 5c8e6ce9bac34e5597812845a309938c063e91bb Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 30 Jul 2024 08:03:47 -0500 Subject: [PATCH 55/63] Add timer dependency for minmax examples. --- minmax/example/Jamfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/minmax/example/Jamfile b/minmax/example/Jamfile index 56d771de6..9aa7e6982 100644 --- a/minmax/example/Jamfile +++ b/minmax/example/Jamfile @@ -7,7 +7,10 @@ # http://www.boost.org/LICENSE_1_0.txt) # -project : requirements /boost/algorithm//boost_algorithm ; +project + : requirements + /boost/algorithm//boost_algorithm + /boost/timer//boost_timer ; exe minmax_ex : minmax_ex.cpp ; exe minmax_timer : minmax_timer.cpp ; From bbfcdf1322b334546cf50b23d083a853b94773b6 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Thu, 8 Aug 2024 21:45:19 -0500 Subject: [PATCH 56/63] Change Boost Test build refs to work with both old and modular test lib targets. --- minmax/test/Jamfile.v2 | 2 +- string/test/Jamfile.v2 | 2 +- test/Jamfile.v2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/minmax/test/Jamfile.v2 b/minmax/test/Jamfile.v2 index cdc468cb8..de74e2c64 100644 --- a/minmax/test/Jamfile.v2 +++ b/minmax/test/Jamfile.v2 @@ -13,7 +13,7 @@ project : requirements /boost/algorithm//boost_algorithm ; alias unit_test_framework : # sources - /boost/test//unit_test_framework + /boost/test//boost_unit_test_framework ; { diff --git a/string/test/Jamfile.v2 b/string/test/Jamfile.v2 index adbb275d1..8c9508504 100644 --- a/string/test/Jamfile.v2 +++ b/string/test/Jamfile.v2 @@ -13,7 +13,7 @@ project : requirements /boost/algorithm//boost_algorithm ; alias unit_test_framework : # sources - /boost/test//unit_test_framework + /boost/test//boost_unit_test_framework ; test-suite algorithm/string diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 581abff34..0c0f93360 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -13,7 +13,7 @@ project : requirements /boost/algorithm//boost_algorithm ; alias unit_test_framework : # sources - /boost/test//unit_test_framework + /boost/test//boost_unit_test_framework ; From 35a55238a735f0f0eb45e94bf3c1f69dc711d617 Mon Sep 17 00:00:00 2001 From: Alexandre Hamez Date: Mon, 13 Jan 2025 11:20:30 +0100 Subject: [PATCH 57/63] Fix documentation for trim_all and trim_fill --- include/boost/algorithm/string/trim_all.hpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/boost/algorithm/string/trim_all.hpp b/include/boost/algorithm/string/trim_all.hpp index a616f7f33..94f2522bc 100644 --- a/include/boost/algorithm/string/trim_all.hpp +++ b/include/boost/algorithm/string/trim_all.hpp @@ -108,7 +108,6 @@ namespace boost { \param Input An input sequence \param Loc A locale used for 'space' classification - \return A trimmed copy of the input */ template inline void trim_all(SequenceT& Input, const std::locale& Loc =std::locale()) @@ -191,7 +190,6 @@ namespace boost { \param Input An input sequence \param Fill A string used to fill the inner spaces \param Loc A locale used for 'space' classification - \return A trimmed copy of the input */ template inline void trim_fill(SequenceT& Input, const RangeT& Fill, const std::locale& Loc =std::locale()) From 7012619c8056b1b30f88bc57dd39c80c0018214f Mon Sep 17 00:00:00 2001 From: Yuriy Chernyshov Date: Mon, 5 May 2025 18:01:59 +0200 Subject: [PATCH 58/63] Add missing include --- include/boost/algorithm/searching/boyer_moore.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/include/boost/algorithm/searching/boyer_moore.hpp b/include/boost/algorithm/searching/boyer_moore.hpp index 80a5a4474..e3c00105c 100644 --- a/include/boost/algorithm/searching/boyer_moore.hpp +++ b/include/boost/algorithm/searching/boyer_moore.hpp @@ -10,6 +10,7 @@ #ifndef BOOST_ALGORITHM_BOYER_MOORE_SEARCH_HPP #define BOOST_ALGORITHM_BOYER_MOORE_SEARCH_HPP +#include // for std::reverse_copy #include // for std::iterator_traits #include From c9e890bb85daf30c92b975e3daed3af0dfcb74ae Mon Sep 17 00:00:00 2001 From: "James E. King III" Date: Mon, 23 Jun 2025 21:06:23 -0400 Subject: [PATCH 59/63] Fix minmax_timer build --- minmax/example/minmax_timer.cpp | 37 ++++++++++++++++----------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/minmax/example/minmax_timer.cpp b/minmax/example/minmax_timer.cpp index 0ab51a8a4..41aecfcce 100644 --- a/minmax/example/minmax_timer.cpp +++ b/minmax/example/minmax_timer.cpp @@ -15,8 +15,10 @@ // What's the proper BOOST_ flag for vs #include -#include #include +#include +#include +#include template void tie(std::pair p, T1& min, T2& max) @@ -56,17 +58,19 @@ inline int opt_boost_minmax_count(int n) { int repeats = 10; #define TIMER( n, cmd , cmdname ) \ - t.restart(); \ - for (int i=0; i void test_minmax_element(CIterator first, CIterator last, int n, char* name) { typedef typename std::iterator_traits::value_type vtype; - boost::timer t; + boost::timer::cpu_timer t; std::cout << " ON " << name << " WITH OPERATOR<()\n"; TIMER( n, std::min_element(first, last), @@ -99,15 +103,11 @@ void test_minmax_element(CIterator first, CIterator last, int n, char* name) "boost::last_min_last_max_element" << name << " "); #define pred std::bind2nd( std::greater(), vtype(10) ) - TIMER( n, boost::min_element_if(first, last, pred), - "boost::min_element_if" << name << ""); - TIMER( n, boost::max_element_if(first, last, pred), - "boost::max_element_if" << name << ""); - TIMER( n, std::min_element(boost::make_filter_iterator(first, last, pred), - boost::make_filter_iterator(last, last, pred)), + TIMER( n, std::min_element(boost::make_filter_iterator(pred, first, last), + boost::make_filter_iterator(pred, last, last)), "std::min_element_with_filter_iterator" << name << ""); - TIMER( n, std::max_element(boost::make_filter_iterator(first, last, pred), - boost::make_filter_iterator(last, last, pred)), + TIMER( n, std::max_element(boost::make_filter_iterator(pred, first, last), + boost::make_filter_iterator(pred, last, last)), "std::max_element_if_with_filter_iterator" << name << ""); #undef pred @@ -199,10 +199,9 @@ void test(int n) test_range(first, last, n); } -int -main(char argc, char** argv) +int main(int argc, char** argv) { - int n = 100; + int n = 1000; if (argc > 1) n = atoi(argv[1]); if (argc > 2) repeats = atoi(argv[2]); From 4de0842c4739f10e175e4ea642c3083be1f6d7fb Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Mon, 25 Aug 2025 17:26:05 +0200 Subject: [PATCH 60/63] Update Link to regression test matrix in README --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d0d5752fa..80fb526c6 100644 --- a/README.md +++ b/README.md @@ -13,8 +13,8 @@ Distributed under the [Boost Software License, Version 1.0](http://www.boost.org Branch | Travis | Appveyor | Coverity Scan | codecov.io | Deps | Docs | Tests | :-------------: | ------ | -------- | ------------- | ---------- | ---- | ---- | ----- | -[`master`](https://github.com/boostorg/algorithm/tree/master) | [![Build Status](https://travis-ci.org/boostorg/algorithm.svg?branch=master)](https://travis-ci.org/boostorg/algorithm) | [![Build status](https://ci.appveyor.com/api/projects/status/FIXME/branch/master?svg=true)](https://ci.appveyor.com/project/USER/PROJECT/branch/master) | [![Coverity Scan Build Status](https://scan.coverity.com/projects/99999/badge.svg)](https://scan.coverity.com/projects/boostorg-algorithm) | [![codecov](https://codecov.io/gh/boostorg/algorithm/branch/master/graph/badge.svg)](https://codecov.io/gh/boostorg/algorithm/branch/master)| [![Deps](https://img.shields.io/badge/deps-master-brightgreen.svg)](https://pdimov.github.io/boostdep-report/master/algorithm.html) | [![Documentation](https://img.shields.io/badge/docs-master-brightgreen.svg)](http://www.boost.org/doc/libs/master/doc/html/algorithm.html) | [![Enter the Matrix](https://img.shields.io/badge/matrix-master-brightgreen.svg)](http://www.boost.org/development/tests/master/developer/algorithm.html) -[`develop`](https://github.com/boostorg/algorithm/tree/develop) | [![Build Status](https://travis-ci.org/boostorg/algorithm.svg?branch=develop)](https://travis-ci.org/boostorg/algorithm) | [![Build status](https://ci.appveyor.com/api/projects/status/FIXME/branch/develop?svg=true)](https://ci.appveyor.com/project/USER/PROJECT/branch/develop) | [![Coverity Scan Build Status](https://scan.coverity.com/projects/99999/badge.svg)](https://scan.coverity.com/projects/boostorg-algorithm) | [![codecov](https://codecov.io/gh/boostorg/algorithm/branch/develop/graph/badge.svg)](https://codecov.io/gh/boostorg/algorithm/branch/develop) | [![Deps](https://img.shields.io/badge/deps-develop-brightgreen.svg)](https://pdimov.github.io/boostdep-report/develop/algorithm.html) | [![Documentation](https://img.shields.io/badge/docs-develop-brightgreen.svg)](http://www.boost.org/doc/libs/develop/doc/html/algorithm.html) | [![Enter the Matrix](https://img.shields.io/badge/matrix-develop-brightgreen.svg)](http://www.boost.org/development/tests/develop/developer/algorithm.html) +[`master`](https://github.com/boostorg/algorithm/tree/master) | [![Build Status](https://travis-ci.org/boostorg/algorithm.svg?branch=master)](https://travis-ci.org/boostorg/algorithm) | [![Build status](https://ci.appveyor.com/api/projects/status/FIXME/branch/master?svg=true)](https://ci.appveyor.com/project/USER/PROJECT/branch/master) | [![Coverity Scan Build Status](https://scan.coverity.com/projects/99999/badge.svg)](https://scan.coverity.com/projects/boostorg-algorithm) | [![codecov](https://codecov.io/gh/boostorg/algorithm/branch/master/graph/badge.svg)](https://codecov.io/gh/boostorg/algorithm/branch/master)| [![Deps](https://img.shields.io/badge/deps-master-brightgreen.svg)](https://pdimov.github.io/boostdep-report/master/algorithm.html) | [![Documentation](https://img.shields.io/badge/docs-master-brightgreen.svg)](http://www.boost.org/doc/libs/master/doc/html/algorithm.html) | [![Enter the Matrix](https://img.shields.io/badge/matrix-master-brightgreen.svg)](https://regression.boost.io/master/developer/algorithm.html) +[`develop`](https://github.com/boostorg/algorithm/tree/develop) | [![Build Status](https://travis-ci.org/boostorg/algorithm.svg?branch=develop)](https://travis-ci.org/boostorg/algorithm) | [![Build status](https://ci.appveyor.com/api/projects/status/FIXME/branch/develop?svg=true)](https://ci.appveyor.com/project/USER/PROJECT/branch/develop) | [![Coverity Scan Build Status](https://scan.coverity.com/projects/99999/badge.svg)](https://scan.coverity.com/projects/boostorg-algorithm) | [![codecov](https://codecov.io/gh/boostorg/algorithm/branch/develop/graph/badge.svg)](https://codecov.io/gh/boostorg/algorithm/branch/develop) | [![Deps](https://img.shields.io/badge/deps-develop-brightgreen.svg)](https://pdimov.github.io/boostdep-report/develop/algorithm.html) | [![Documentation](https://img.shields.io/badge/docs-develop-brightgreen.svg)](http://www.boost.org/doc/libs/develop/doc/html/algorithm.html) | [![Enter the Matrix](https://img.shields.io/badge/matrix-develop-brightgreen.svg)](https://regression.boost.io/develop/developer/algorithm.html) ### Directories From fee839977269158676c5786389090dc9b438958d Mon Sep 17 00:00:00 2001 From: Andrey Semashev Date: Thu, 22 Jan 2026 20:00:01 +0300 Subject: [PATCH 61/63] Remove dependencies on Boost.StaticAssert. Boost.StaticAssert has been merged into Boost.Config, so remove the dependency. --- CMakeLists.txt | 1 - build.jam | 1 - 2 files changed, 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 806b689ee..d51d4bef7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,7 +26,6 @@ target_link_libraries(boost_algorithm Boost::mpl Boost::range Boost::regex - Boost::static_assert Boost::throw_exception Boost::tuple Boost::type_traits diff --git a/build.jam b/build.jam index 49099290d..33b732316 100644 --- a/build.jam +++ b/build.jam @@ -18,7 +18,6 @@ constant boost_dependencies : /boost/mpl//boost_mpl /boost/range//boost_range /boost/regex//boost_regex - /boost/static_assert//boost_static_assert /boost/throw_exception//boost_throw_exception /boost/tuple//boost_tuple /boost/type_traits//boost_type_traits From bdaee1f3f61eb882a321fe7dd3986ea32a272def Mon Sep 17 00:00:00 2001 From: Anton Karpov Date: Mon, 3 Aug 2026 16:52:44 +0300 Subject: [PATCH 62/63] [doc] Fix the parameter names documented for is_permutation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The three-argument overload documents `\param last2`, but its parameters are `first1`, `last1`, `first2` — `last2` is a local variable computed inside the body. The four-argument overload right above it documents `last1` correctly. Both `\fn` lines also spell the first two parameters `first` and `last` while the declarations use `first1` and `last1`. --- include/boost/algorithm/cxx11/is_permutation.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/boost/algorithm/cxx11/is_permutation.hpp b/include/boost/algorithm/cxx11/is_permutation.hpp index 693f54a49..fb4083a15 100644 --- a/include/boost/algorithm/cxx11/is_permutation.hpp +++ b/include/boost/algorithm/cxx11/is_permutation.hpp @@ -100,7 +100,7 @@ namespace detail { } /// \endcond -/// \fn is_permutation ( ForwardIterator1 first, ForwardIterator1 last, ForwardIterator2 first2, BinaryPredicate p ) +/// \fn is_permutation ( ForwardIterator1 first1, ForwardIterator1 last1, ForwardIterator2 first2, BinaryPredicate p ) /// \brief Tests to see if the sequence [first,last) is a permutation of the sequence starting at first2 /// /// \param first1 The start of the input sequence @@ -127,11 +127,11 @@ bool is_permutation ( ForwardIterator1 first1, ForwardIterator1 last1, return true; } -/// \fn is_permutation ( ForwardIterator1 first, ForwardIterator1 last, ForwardIterator2 first2 ) +/// \fn is_permutation ( ForwardIterator1 first1, ForwardIterator1 last1, ForwardIterator2 first2 ) /// \brief Tests to see if the sequence [first,last) is a permutation of the sequence starting at first2 /// /// \param first1 The start of the input sequence -/// \param last2 One past the end of the input sequence +/// \param last1 One past the end of the input sequence /// \param first2 The start of the second sequence /// \note This function is part of the C++2011 standard library. template< class ForwardIterator1, class ForwardIterator2 > From b738d228bfdd3e704d61fc9c76db99e683d3f6a8 Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Mon, 3 Aug 2026 21:40:27 -0700 Subject: [PATCH 63/63] Remove name of unnamed parameter in doxygen comment for --- include/boost/algorithm/string/formatter.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/boost/algorithm/string/formatter.hpp b/include/boost/algorithm/string/formatter.hpp index 0e08ae7b3..ce590c778 100644 --- a/include/boost/algorithm/string/formatter.hpp +++ b/include/boost/algorithm/string/formatter.hpp @@ -75,7 +75,7 @@ namespace boost { Constructs an \c empty_formatter. Empty formatter always returns an empty sequence. - \param Input container used to select a correct value_type for the + \param - container used to select a correct value_type for the resulting empty_container<>. \return An instance of the \c empty_formatter object. */