diff options
6 files changed, 42 insertions, 39 deletions
diff --git a/contrib/restricted/boost/dynamic_bitset/.yandex_meta/default.nix b/contrib/restricted/boost/dynamic_bitset/.yandex_meta/default.nix index eb05c997582..7d16c4a8970 100644 --- a/contrib/restricted/boost/dynamic_bitset/.yandex_meta/default.nix +++ b/contrib/restricted/boost/dynamic_bitset/.yandex_meta/default.nix @@ -1,13 +1,13 @@ self: super: with self; { boost_dynamic_bitset = stdenv.mkDerivation rec { pname = "boost_dynamic_bitset"; - version = "1.87.0"; + version = "1.88.0"; src = fetchFromGitHub { owner = "boostorg"; repo = "dynamic_bitset"; rev = "boost-${version}"; - hash = "sha256-zTjTwvRgETHTST9vVqpy5yIcZ+QT+eyuPY4AmNprnpM="; + hash = "sha256-EYyMQEQZvs2vp25O1xZTBmnGR819xHVQsZ/MVx1CWv8="; }; }; } diff --git a/contrib/restricted/boost/dynamic_bitset/.yandex_meta/devtools.licenses.report b/contrib/restricted/boost/dynamic_bitset/.yandex_meta/devtools.licenses.report index 73e707776ca..c8dd81df35b 100644 --- a/contrib/restricted/boost/dynamic_bitset/.yandex_meta/devtools.licenses.report +++ b/contrib/restricted/boost/dynamic_bitset/.yandex_meta/devtools.licenses.report @@ -64,26 +64,26 @@ BELONGS ya.make include/boost/dynamic_bitset/serialization.hpp [5:7] include/boost/dynamic_bitset_fwd.hpp [6:8] -KEEP BSL-1.0 648ee54e68cb4c96cfd2e41a7a53e0f8 +KEEP BSL-1.0 a5006bb276a0e8fcc0c080cd5a14814e BELONGS ya.make - License text: - \### License - Distributed under the [Boost Software License, Version 1.0](http://www.boost.org/LICENSE_1_0.txt). + Note: matched license text is too long. Read it in the source files. Scancode info: Original SPDX id: BSL-1.0 - Score : 60.00 + Score : 55.00 Match type : NOTICE Links : http://www.boost.org/LICENSE_1_0.txt, http://www.boost.org/users/license.html, https://spdx.org/licenses/BSL-1.0 Files with this license: - README.md [3:5] + README.md [33:33] -KEEP BSL-1.0 901941bd35f9f19e23af80f6271c10c4 +KEEP BSL-1.0 a84b62b7fab19a18e7129119ab661542 BELONGS ya.make - Note: matched license text is too long. Read it in the source files. + License text: + \### License + Distributed under the [Boost Software License, Version 1.0](https://www.boost.org/LICENSE_1_0.txt). Scancode info: Original SPDX id: BSL-1.0 - Score : 60.00 + Score : 55.00 Match type : NOTICE Links : http://www.boost.org/LICENSE_1_0.txt, http://www.boost.org/users/license.html, https://spdx.org/licenses/BSL-1.0 Files with this license: - README.md [32:32] + README.md [3:5] diff --git a/contrib/restricted/boost/dynamic_bitset/.yandex_meta/licenses.list.txt b/contrib/restricted/boost/dynamic_bitset/.yandex_meta/licenses.list.txt index 7f9e63ac0b3..5bef00eca57 100644 --- a/contrib/restricted/boost/dynamic_bitset/.yandex_meta/licenses.list.txt +++ b/contrib/restricted/boost/dynamic_bitset/.yandex_meta/licenses.list.txt @@ -1,11 +1,11 @@ ====================BSL-1.0==================== ### License -Distributed under the [Boost Software License, Version 1.0](http://www.boost.org/LICENSE_1_0.txt). +Distributed under the [Boost Software License, Version 1.0](https://www.boost.org/LICENSE_1_0.txt). ====================BSL-1.0==================== -* 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). +* 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](https://www.boost.org/LICENSE_1_0.txt). ====================BSL-1.0==================== diff --git a/contrib/restricted/boost/dynamic_bitset/README.md b/contrib/restricted/boost/dynamic_bitset/README.md index d63e2da5f7d..20732a41a72 100644 --- a/contrib/restricted/boost/dynamic_bitset/README.md +++ b/contrib/restricted/boost/dynamic_bitset/README.md @@ -1,20 +1,21 @@ -DynamicBitset, part of collection of the [Boost C++ Libraries](http://github.com/boostorg), is similar to std::bitset however the size is specified at run-time instead of at compile-time. +DynamicBitset, part of collection of the [Boost C++ Libraries](https://github.com/boostorg), is similar to std::bitset however the size is specified at run-time instead of at compile-time. ### License -Distributed under the [Boost Software License, Version 1.0](http://www.boost.org/LICENSE_1_0.txt). +Distributed under the [Boost Software License, Version 1.0](https://www.boost.org/LICENSE_1_0.txt). ### Properties -* C++03 +* C++11 * Header-only ### Build Status -Branch | GHA CI | Appveyor | Coverity Scan | codecov.io | Deps | Docs | Tests | -:-------------: | ------ | -------- | ------------- | ---------- | ---- | ---- | ----- | -[`master`](https://github.com/boostorg/dynamic_bitset/tree/master) | [](https://github.com/boostorg/dynamic_bitset/actions?query=branch:master) | [](https://ci.appveyor.com/project/jeking3/dynamic_bitset-jv17p/branch/master) | [](https://scan.coverity.com/projects/boostorg-dynamic_bitset) | [](https://codecov.io/gh/boostorg/dynamic_bitset/branch/master)| [](https://pdimov.github.io/boostdep-report/master/dynamic_bitset.html) | [](http://www.boost.org/doc/libs/master/doc/html/dynamic_bitset.html) | [](http://www.boost.org/development/tests/master/developer/dynamic_bitset.html) -[`develop`](https://github.com/boostorg/dynamic_bitset/tree/develop) | [](https://github.com/boostorg/dynamic_bitset/actions?query=branch:develop) | [](https://ci.appveyor.com/project/jeking3/dynamic_bitset-jv17p/branch/develop) | [](https://scan.coverity.com/projects/boostorg-dynamic_bitset) | [](https://codecov.io/gh/boostorg/dynamic_bitset/branch/develop) | [](https://pdimov.github.io/boostdep-report/develop/dynamic_bitset.html) | [](http://www.boost.org/doc/libs/develop/doc/html/dynamic_bitset.html) | [](http://www.boost.org/development/tests/develop/developer/dynamic_bitset.html) +<!-- boost-ci/tools/makebadges.sh --project dynamic_bitset --appveyor n7bki5ka3v918r5r --codecov PVG5jth1ez --coverity 16167 --> +| Branch | GHA CI | Appveyor | Coverity Scan | codecov.io | Deps | Docs | Tests | +| :-------------: | ------ | -------- | ------------- | ---------- | ---- | ---- | ----- | +| [`master`](https://github.com/boostorg/dynamic_bitset/tree/master) | [](https://github.com/boostorg/dynamic_bitset/actions?query=branch:master) | [](https://ci.appveyor.com/project/cppalliance/dynamic-bitset/branch/master) | [](https://scan.coverity.com/projects/boostorg-dynamic_bitset) | [](https://codecov.io/gh/boostorg/dynamic_bitset/tree/master) | [](https://pdimov.github.io/boostdep-report/master/dynamic_bitset.html) | [](https://www.boost.org/doc/libs/master/libs/dynamic_bitset) | [](https://www.boost.org/development/tests/master/developer/dynamic_bitset.html) +| [`develop`](https://github.com/boostorg/dynamic_bitset/tree/develop) | [](https://github.com/boostorg/dynamic_bitset/actions?query=branch:develop) | [](https://ci.appveyor.com/project/cppalliance/dynamic-bitset/branch/develop) | [](https://scan.coverity.com/projects/boostorg-dynamic_bitset) | [](https://codecov.io/gh/boostorg/dynamic_bitset/tree/develop) | [](https://pdimov.github.io/boostdep-report/develop/dynamic_bitset.html) | [](https://www.boost.org/doc/libs/develop/libs/dynamic_bitset) | [](https://www.boost.org/development/tests/develop/developer/dynamic_bitset.html) ### Directories @@ -27,8 +28,7 @@ Branch | GHA CI | Appveyor | Coverity Scan | codecov.io | Deps | Docs | ### More information -* [Ask questions](http://stackoverflow.com/questions/ask?tags=c%2B%2B,boost,boost-dynamic_bitset) +* [Ask questions](https://stackoverflow.com/questions/ask?tags=c%2B%2B,boost,boost-dynamic_bitset) * [Report bugs](https://github.com/boostorg/dynamic_bitset/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 `[dynamic_bitset]` tag at the beginning of the subject line. - +* 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](https://www.boost.org/LICENSE_1_0.txt). +* Discussions about the library are held on the [Boost developers mailing list](https://www.boost.org/community/groups.html#main). Be sure to read the [discussion policy](https://www.boost.org/community/policy.html) before posting and add the `[dynamic_bitset]` tag at the beginning of the subject line. diff --git a/contrib/restricted/boost/dynamic_bitset/include/boost/dynamic_bitset/dynamic_bitset.hpp b/contrib/restricted/boost/dynamic_bitset/include/boost/dynamic_bitset/dynamic_bitset.hpp index 62a95e78336..9525666bd25 100644 --- a/contrib/restricted/boost/dynamic_bitset/include/boost/dynamic_bitset/dynamic_bitset.hpp +++ b/contrib/restricted/boost/dynamic_bitset/include/boost/dynamic_bitset/dynamic_bitset.hpp @@ -325,6 +325,7 @@ public: // lookup size_type find_first() const; + size_type find_first(size_type pos) const; size_type find_next(size_type pos) const; @@ -729,7 +730,7 @@ dynamic_bitset(dynamic_bitset<Block, Allocator>&& b) : m_bits(boost::move(b.m_bits)), m_num_bits(boost::move(b.m_num_bits)) { // Required so that assert(m_check_invariants()); works. - assert((b.m_bits = buffer_type()).empty()); + assert((b.m_bits = buffer_type(get_allocator())).empty()); b.m_num_bits = 0; } @@ -742,7 +743,7 @@ operator=(dynamic_bitset<Block, Allocator>&& b) m_bits = boost::move(b.m_bits); m_num_bits = boost::move(b.m_num_bits); // Required so that assert(m_check_invariants()); works. - assert((b.m_bits = buffer_type()).empty()); + assert((b.m_bits = buffer_type(get_allocator())).empty()); b.m_num_bits = 0; return *this; } @@ -815,8 +816,7 @@ void dynamic_bitset<Block, Allocator>:: push_back(bool bit) { const size_type sz = size(); - resize(sz + 1); - set(sz, bit); + resize(sz + 1, bit); } template <typename Block, typename Allocator> @@ -1326,7 +1326,7 @@ to_ulong() const // Check for overflows. This may be a performance burden on very // large bitsets but is required by the specification, sorry - if (find_next(ulong_width - 1) != npos) + if (find_first(ulong_width) != npos) BOOST_THROW_EXCEPTION(std::overflow_error("boost::dynamic_bitset::to_ulong overflow")); @@ -1486,17 +1486,12 @@ dynamic_bitset<Block, Allocator>::find_first() const return m_do_find_from(0); } - template <typename Block, typename Allocator> typename dynamic_bitset<Block, Allocator>::size_type -dynamic_bitset<Block, Allocator>::find_next(size_type pos) const +dynamic_bitset<Block, Allocator>::find_first(size_type pos) const { - const size_type sz = size(); - if (pos >= (sz-1) || sz == 0) - return npos; - - ++pos; + if (pos >= sz) return npos; const size_type blk = block_index(pos); const block_width_type ind = bit_index(pos); @@ -1508,7 +1503,15 @@ dynamic_bitset<Block, Allocator>::find_next(size_type pos) const pos + static_cast<size_type>(detail::lowest_bit(fore)) : m_do_find_from(blk + 1); +} + +template <typename Block, typename Allocator> +typename dynamic_bitset<Block, Allocator>::size_type +dynamic_bitset<Block, Allocator>::find_next(size_type pos) const +{ + if (pos == npos) return npos; + return find_first(pos + 1); } diff --git a/contrib/restricted/boost/dynamic_bitset/ya.make b/contrib/restricted/boost/dynamic_bitset/ya.make index 6590530e54b..2877d9b2150 100644 --- a/contrib/restricted/boost/dynamic_bitset/ya.make +++ b/contrib/restricted/boost/dynamic_bitset/ya.make @@ -6,9 +6,9 @@ LICENSE(BSL-1.0) LICENSE_TEXTS(.yandex_meta/licenses.list.txt) -VERSION(1.87.0) +VERSION(1.88.0) -ORIGINAL_SOURCE(https://github.com/boostorg/dynamic_bitset/archive/boost-1.87.0.tar.gz) +ORIGINAL_SOURCE(https://github.com/boostorg/dynamic_bitset/archive/boost-1.88.0.tar.gz) PEERDIR( contrib/restricted/boost/assert |