summaryrefslogtreecommitdiff
path: root/dev-libs/boost/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-04-30 23:18:22 +0100
committerV3n3RiX <venerix@koprulu.sector>2023-04-30 23:18:22 +0100
commit36f117bb6eda5dab3ecc30577395d0279ed3f8f5 (patch)
treef13c93862d98a9d54ca0985d38f5f64bcd6f0547 /dev-libs/boost/files
parentce23b28e3d5f58b4177dfa6006db905a41dd87ee (diff)
gentoo auto-resync : 30:04:2023 - 23:18:21
Diffstat (limited to 'dev-libs/boost/files')
-rw-r--r--dev-libs/boost/files/boost-1.80.0-disable_icu_rpath.patch13
-rw-r--r--dev-libs/boost/files/boost-1.80.0-python3.11.patch33
-rw-r--r--dev-libs/boost/files/boost-1.80.0-unary-function.patch27
-rw-r--r--dev-libs/boost/files/boost-1.80.0-unordered-fix.patch192
-rw-r--r--dev-libs/boost/files/boost-1.80.0-unordered-ftm-malloc.patch21
5 files changed, 0 insertions, 286 deletions
diff --git a/dev-libs/boost/files/boost-1.80.0-disable_icu_rpath.patch b/dev-libs/boost/files/boost-1.80.0-disable_icu_rpath.patch
deleted file mode 100644
index 1f4ec29fcf00..000000000000
--- a/dev-libs/boost/files/boost-1.80.0-disable_icu_rpath.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/libs/locale/build/Jamfile.v2
-+++ b/libs/locale/build/Jamfile.v2
-@@ -82,8 +82,8 @@ ICU_LINK ?= [ modules.peek : ICU_LINK_LOCALE ] ;
-
- if $(ICU_LINK)
- {
-- ICU_OPTS = <include>$(icu-path)/include <linkflags>$(ICU_LINK) <dll-path>$(icu-path)/bin <runtime-link>shared ;
-- ICU64_OPTS = <include>$(icu-path)/include <linkflags>$(ICU_LINK) <dll-path>$(icu-path)/bin64 <runtime-link>shared ;
-+ ICU_OPTS = <include>$(icu_path)/include <linkflags>$(ICU_LINK) <runtime-link>shared ;
-+ ICU64_OPTS = <include>$(icu_path)/include <linkflags>$(ICU_LINK) <runtime-link>shared ;
- } else
- {
- searched-lib icuuc : : <name>icuuc
diff --git a/dev-libs/boost/files/boost-1.80.0-python3.11.patch b/dev-libs/boost/files/boost-1.80.0-python3.11.patch
deleted file mode 100644
index cdbc36ca953f..000000000000
--- a/dev-libs/boost/files/boost-1.80.0-python3.11.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://github.com/boostorg/python/commit/a218babc8daee904a83f550fb66e5cb3f1cb3013
-https://github.com/boostorg/python/pull/385
-
-From a218babc8daee904a83f550fb66e5cb3f1cb3013 Mon Sep 17 00:00:00 2001
-From: Victor Stinner <vstinner@python.org>
-Date: Mon, 25 Apr 2022 10:51:46 +0200
-Subject: [PATCH] Fix enum_type_object type on Python 3.11
-
-The enum_type_object type inherits from PyLong_Type which is not tracked
-by the GC. Instances doesn't have to be tracked by the GC: remove the
-Py_TPFLAGS_HAVE_GC flag.
-
-The Python C API documentation says:
-
- "To create a container type, the tp_flags field of the type object
- must include the Py_TPFLAGS_HAVE_GC and provide an implementation of
- the tp_traverse handler."
-
-https://docs.python.org/dev/c-api/gcsupport.html
-
-The new exception was introduced in Python 3.11 by:
-https://github.com/python/cpython/issues/88429
---- a/libs/python/src/object/enum.cpp
-+++ b/libs/python/src/object/enum.cpp
-@@ -113,7 +113,6 @@ static PyTypeObject enum_type_object = {
- #if PY_VERSION_HEX < 0x03000000
- | Py_TPFLAGS_CHECKTYPES
- #endif
-- | Py_TPFLAGS_HAVE_GC
- | Py_TPFLAGS_BASETYPE, /* tp_flags */
- 0, /* tp_doc */
- 0, /* tp_traverse */
-
diff --git a/dev-libs/boost/files/boost-1.80.0-unary-function.patch b/dev-libs/boost/files/boost-1.80.0-unary-function.patch
deleted file mode 100644
index 7941d7c66395..000000000000
--- a/dev-libs/boost/files/boost-1.80.0-unary-function.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://bugs.gentoo.org/869401
-https://github.com/boostorg/config/commit/f0af4a9184457939b89110795ae2d293582c5f66
-https://github.com/boostorg/container_hash/issues/24
-
-From: jzmaddock <john@johnmaddock.co.uk>
-Date: Mon, 11 Jul 2022 18:26:07 +0100
-Subject: [PATCH] The std lib unary/binary_function base classes are
- deprecated/removed from libcpp15. Fixes
- https://github.com/boostorg/container_hash/issues/24.
-
---- a/boost/config/stdlib/libcpp.hpp
-+++ b/boost/config/stdlib/libcpp.hpp
-@@ -168,4 +168,13 @@
- # define BOOST_NO_CXX14_HDR_SHARED_MUTEX
- #endif
-
-+#if _LIBCPP_VERSION >= 15000
-+//
-+// Unary function is now deprecated in C++11 and later:
-+//
-+#if __cplusplus >= 201103L
-+#define BOOST_NO_CXX98_FUNCTION_BASE
-+#endif
-+#endif
-+
- // --- end ---
-
diff --git a/dev-libs/boost/files/boost-1.80.0-unordered-fix.patch b/dev-libs/boost/files/boost-1.80.0-unordered-fix.patch
deleted file mode 100644
index 51776094386e..000000000000
--- a/dev-libs/boost/files/boost-1.80.0-unordered-fix.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-From f9eae4153f4ea9aac4b6c46e660ec92824d5827f Mon Sep 17 00:00:00 2001
-From: Christian Mazakas <christian.mazakas@gmail.com>
-Date: Tue, 16 Aug 2022 14:34:58 -0700
-Subject: [PATCH] Update code to be valid when the internal `buckets_` data
- member is moved-from
-
----
- boost/unordered/detail/fca.hpp | 18 +++++--
- .../boost/unordered/detail/implementation.hpp | 49 +++++++++++--------
- boost/unordered/unordered_map.hpp | 8 +++
- boost/unordered/unordered_set.hpp | 8 +++
- 4 files changed, 58 insertions(+), 25 deletions(-)
-
-diff --git a/boost/unordered/detail/fca.hpp b/boost/unordered/detail/fca.hpp
-index 19fafe739..a1d14d957 100644
---- a/boost/unordered/detail/fca.hpp
-+++ b/boost/unordered/detail/fca.hpp
-@@ -646,7 +646,7 @@ namespace boost {
-
- size_type bucket_count() const { return size_; }
-
-- iterator begin() const { return ++at(size_); }
-+ iterator begin() const { return size_ == 0 ? end() : ++at(size_); }
-
- iterator end() const
- {
-@@ -660,6 +660,10 @@ namespace boost {
-
- local_iterator begin(size_type n) const
- {
-+ if (size_ == 0) {
-+ return this->end(n);
-+ }
-+
- return local_iterator(
- (buckets + static_cast<difference_type>(n))->next);
- }
-@@ -670,12 +674,16 @@ namespace boost {
-
- iterator at(size_type n) const
- {
-- std::size_t const N = group::N;
-+ if (size_ > 0) {
-+ std::size_t const N = group::N;
-
-- iterator pbg(buckets + static_cast<difference_type>(n),
-- groups + static_cast<difference_type>(n / N));
-+ iterator pbg(buckets + static_cast<difference_type>(n),
-+ groups + static_cast<difference_type>(n / N));
-
-- return pbg;
-+ return pbg;
-+ } else {
-+ return this->end();
-+ }
- }
-
- span<Bucket> raw()
-diff --git a/boost/unordered/detail/implementation.hpp b/boost/unordered/detail/implementation.hpp
-index 2cc27c5d4..373236754 100644
---- a/boost/unordered/detail/implementation.hpp
-+++ b/boost/unordered/detail/implementation.hpp
-@@ -2054,12 +2054,14 @@ namespace boost {
-
- std::size_t bucket_size(std::size_t index) const
- {
-- bucket_iterator itb = buckets_.at(index);
-- node_pointer n = itb->next;
- std::size_t count = 0;
-- while (n) {
-- ++count;
-- n = n->next;
-+ if (size_ > 0) {
-+ bucket_iterator itb = buckets_.at(index);
-+ node_pointer n = itb->next;
-+ while (n) {
-+ ++count;
-+ n = n->next;
-+ }
- }
- return count;
- }
-@@ -2420,11 +2422,14 @@ namespace boost {
- node_pointer find_node_impl(
- Key const& x, bucket_iterator itb) const
- {
-- key_equal const& pred = this->key_eq();
-- node_pointer p = itb->next;
-- for (; p; p = p->next) {
-- if (pred(x, extractor::extract(p->value()))) {
-- break;
-+ node_pointer p = node_pointer();
-+ if (itb != buckets_.end()) {
-+ key_equal const& pred = this->key_eq();
-+ p = itb->next;
-+ for (; p; p = p->next) {
-+ if (pred(x, extractor::extract(p->value()))) {
-+ break;
-+ }
- }
- }
- return p;
-@@ -2453,11 +2458,13 @@ namespace boost {
- inline iterator transparent_find(
- Key const& k, Hash const& h, Pred const& pred) const
- {
-- std::size_t const key_hash = h(k);
-- bucket_iterator itb = buckets_.at(buckets_.position(key_hash));
-- for (node_pointer p = itb->next; p; p = p->next) {
-- if (BOOST_LIKELY(pred(k, extractor::extract(p->value())))) {
-- return iterator(p, itb);
-+ if (size_ > 0) {
-+ std::size_t const key_hash = h(k);
-+ bucket_iterator itb = buckets_.at(buckets_.position(key_hash));
-+ for (node_pointer p = itb->next; p; p = p->next) {
-+ if (BOOST_LIKELY(pred(k, extractor::extract(p->value())))) {
-+ return iterator(p, itb);
-+ }
- }
- }
-
-@@ -2467,11 +2474,13 @@ namespace boost {
- template <class Key>
- node_pointer* find_prev(Key const& key, bucket_iterator itb)
- {
-- key_equal pred = this->key_eq();
-- for (node_pointer* pp = boost::addressof(itb->next); *pp;
-- pp = boost::addressof((*pp)->next)) {
-- if (pred(key, extractor::extract((*pp)->value()))) {
-- return pp;
-+ if (size_ > 0) {
-+ key_equal pred = this->key_eq();
-+ for (node_pointer* pp = boost::addressof(itb->next); *pp;
-+ pp = boost::addressof((*pp)->next)) {
-+ if (pred(key, extractor::extract((*pp)->value()))) {
-+ return pp;
-+ }
- }
- }
- typedef node_pointer* node_pointer_pointer;
-diff --git a/boost/unordered/unordered_map.hpp b/boost/unordered/unordered_map.hpp
-index 97908fb65..3e25a28a2 100644
---- a/boost/unordered/unordered_map.hpp
-+++ b/boost/unordered/unordered_map.hpp
-@@ -2069,6 +2069,10 @@ namespace boost {
- template <class K, class T, class H, class P, class A>
- float unordered_map<K, T, H, P, A>::load_factor() const BOOST_NOEXCEPT
- {
-+ if (table_.size_ == 0) {
-+ return 0.0f;
-+ }
-+
- BOOST_ASSERT(table_.bucket_count() != 0);
- return static_cast<float>(table_.size_) /
- static_cast<float>(table_.bucket_count());
-@@ -2506,6 +2510,10 @@ namespace boost {
- template <class K, class T, class H, class P, class A>
- float unordered_multimap<K, T, H, P, A>::load_factor() const BOOST_NOEXCEPT
- {
-+ if (table_.size_ == 0) {
-+ return 0.0f;
-+ }
-+
- BOOST_ASSERT(table_.bucket_count() != 0);
- return static_cast<float>(table_.size_) /
- static_cast<float>(table_.bucket_count());
-diff --git a/boost/unordered/unordered_set.hpp b/boost/unordered/unordered_set.hpp
-index 8721a68a0..82d323c6e 100644
---- a/boost/unordered/unordered_set.hpp
-+++ b/boost/unordered/unordered_set.hpp
-@@ -1586,6 +1586,10 @@ namespace boost {
- template <class T, class H, class P, class A>
- float unordered_set<T, H, P, A>::load_factor() const BOOST_NOEXCEPT
- {
-+ if (table_.size_ == 0) {
-+ return 0.0f;
-+ }
-+
- BOOST_ASSERT(table_.bucket_count() != 0);
- return static_cast<float>(table_.size_) /
- static_cast<float>(table_.bucket_count());
-@@ -1986,6 +1990,10 @@ namespace boost {
- template <class T, class H, class P, class A>
- float unordered_multiset<T, H, P, A>::load_factor() const BOOST_NOEXCEPT
- {
-+ if (table_.size_ == 0) {
-+ return 0.0f;
-+ }
-+
- BOOST_ASSERT(table_.bucket_count() != 0);
- return static_cast<float>(table_.size_) /
- static_cast<float>(table_.bucket_count());
diff --git a/dev-libs/boost/files/boost-1.80.0-unordered-ftm-malloc.patch b/dev-libs/boost/files/boost-1.80.0-unordered-ftm-malloc.patch
deleted file mode 100644
index 95b39e4bb6be..000000000000
--- a/dev-libs/boost/files/boost-1.80.0-unordered-ftm-malloc.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://github.com/boostorg/align/commit/5ad7df63cd792fbdb801d600b93cad1a432f0151
-https://github.com/boostorg/align/pull/19
-
-From 5ad7df63cd792fbdb801d600b93cad1a432f0151 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=89rico=20Nogueira=20Rolim?=
- <34201958+ericonr@users.noreply.github.com>
-Date: Fri, 11 Nov 2022 18:29:45 -0300
-Subject: [PATCH] Don't use FTMs to determine implementation choice
-
---- a/boost/align/aligned_alloc.hpp
-+++ b/boost/align/aligned_alloc.hpp
-@@ -38,7 +38,7 @@ Distributed under the Boost Software License, Version 1.0.
- #include <boost/align/detail/aligned_alloc_posix.hpp>
- #elif defined(sun) || defined(__sun)
- #include <boost/align/detail/aligned_alloc_sunos.hpp>
--#elif (_POSIX_C_SOURCE >= 200112L) || (_XOPEN_SOURCE >= 600)
-+#elif defined(_POSIX_VERSION)
- #include <boost/align/detail/aligned_alloc_posix.hpp>
- #else
- #include <boost/align/detail/aligned_alloc.hpp>
-