From 5827bf2574cb5399caa1c748075894974b7b10d7 Mon Sep 17 00:00:00 2001 From: joaquintides Date: Mon, 3 Jun 2024 18:53:24 +0200 Subject: [PATCH 1/5] gotten rid of redundant base1, base2 and base3 --- extra/boost_unordered.natvis | 12 ++++++------ include/boost/unordered/detail/foa/core.hpp | 6 ------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/extra/boost_unordered.natvis b/extra/boost_unordered.natvis index d4dbc186..ff5e5640 100644 --- a/extra/boost_unordered.natvis +++ b/extra/boost_unordered.natvis @@ -347,9 +347,9 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) {{ size={table_.size_ctrl.size} }} - *reinterpret_cast<hasher*>(static_cast<table_type::super::base1*>(&table_)) - *reinterpret_cast<key_equal*>(static_cast<table_type::super::base2*>(&table_)) - *reinterpret_cast<allocator_type*>(static_cast<table_type::super::base3*>(&table_)) + *reinterpret_cast<hasher*>(static_cast<table_type::super::hash_base*>(&table_)) + *reinterpret_cast<key_equal*>(static_cast<table_type::super::pred_base*>(&table_)) + *reinterpret_cast<allocator_type*>(static_cast<table_type::super::allocator_base*>(&table_)) table_ @@ -359,9 +359,9 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) {{ size={table_.size_ctrl.size} }} - *reinterpret_cast<hasher*>(static_cast<table_type::super::base1*>(&table_)) - *reinterpret_cast<key_equal*>(static_cast<table_type::super::base2*>(&table_)) - *reinterpret_cast<allocator_type*>(static_cast<table_type::super::base3*>(&table_)) + *reinterpret_cast<hasher*>(static_cast<table_type::super::hash_base*>(&table_)) + *reinterpret_cast<key_equal*>(static_cast<table_type::super::pred_base*>(&table_)) + *reinterpret_cast<allocator_type*>(static_cast<table_type::super::allocator_base*>(&table_)) table_,view(MapHelper) diff --git a/include/boost/unordered/detail/foa/core.hpp b/include/boost/unordered/detail/foa/core.hpp index 513b433d..db73a866 100644 --- a/include/boost/unordered/detail/foa/core.hpp +++ b/include/boost/unordered/detail/foa/core.hpp @@ -1413,12 +1413,6 @@ __declspec(empty_bases) /* activate EBO with multiple inheritance */ table_core:empty_value,empty_value,empty_value { -private: - // These `baseN` aliases are for debugger visualizations, like natvis - using base1=empty_value; - using base2=empty_value; - using base3=empty_value; - public: using type_policy=TypePolicy; using group_type=Group; From 9995c9beb0ae7539481b6befa2d390c15fa45ec9 Mon Sep 17 00:00:00 2001 From: Braden Ganetsky Date: Thu, 6 Jun 2024 23:05:43 -0500 Subject: [PATCH 2/5] Fix 'invalid argument' to boost::interprocess::shared_memory_object --- test/unordered/mmap_tests.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/test/unordered/mmap_tests.cpp b/test/unordered/mmap_tests.cpp index 73838544..c37400cf 100644 --- a/test/unordered/mmap_tests.cpp +++ b/test/unordered/mmap_tests.cpp @@ -298,6 +298,7 @@ std::string shm_name_sanitize(std::string const& exe_name) case '\\': case '-': case '_': + case '+': return true; default: From cffd0a413e51e848476bff05aa53b93d661e8a80 Mon Sep 17 00:00:00 2001 From: joaquintides Date: Sat, 8 Jun 2024 18:50:31 +0200 Subject: [PATCH 3/5] added CODECOV_TOKEN (#253) * added CODECOV_TOKEN * added missing newline --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 20152938..79a66d15 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -244,6 +244,8 @@ jobs: - name: Upload coverage if: matrix.coverage run: ci/codecov.sh "upload" + env: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - name: Run coverity if: matrix.coverity && github.event_name == 'push' && (github.ref_name == 'develop' || github.ref_name == 'master') From cfa3cb2d1fcca4b8f6e187ec31dcb459f2022226 Mon Sep 17 00:00:00 2001 From: joaquintides Date: Mon, 10 Jun 2024 20:10:01 +0200 Subject: [PATCH 4/5] enabled CI for this branch --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 79a66d15..00201efd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,6 +18,7 @@ on: - feature/** - fix/** - pr/** + - ci/** concurrency: group: ${{format('{0}:{1}', github.repository, github.ref)}} From 3c53fe5db9e65270492724055397cc28583eb943 Mon Sep 17 00:00:00 2001 From: joaquintides Date: Mon, 10 Jun 2024 20:38:10 +0200 Subject: [PATCH 5/5] reverted prior --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 00201efd..79a66d15 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,6 @@ on: - feature/** - fix/** - pr/** - - ci/** concurrency: group: ${{format('{0}:{1}', github.repository, github.ref)}}