Skip to content

Commit d038e65

Browse files
committed
Merge branch 'dynarray_dim0' into 'master'
dynamic array doc See merge request correaa/boost-multi!1756
2 parents ed7c14e + 392c982 commit d038e65

2 files changed

Lines changed: 13 additions & 5 deletions

File tree

.gitlab-ci-correaa.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1488,11 +1488,13 @@ conan:
14881488
needs: ["g++"]
14891489

14901490
github-ci-status:
1491-
stage: build
1491+
stage: test
14921492
interruptible: true
14931493
script:
1494-
- apt-get -qq update && apt-get -qq install --no-install-recommends -y curl jq
1495-
- STATUS=$(curl -s -H "Accept:application/vnd.github+json" https://api.github.com/repos/correaa/boost-multi/actions/workflows/ci.yml/runs?branch=$CI_COMMIT_BRANCH\&per_page=1 | jq -r .workflow_runs[0].conclusion)
1494+
- apt-get -qq update && apt-get -qq install --no-install-recommends -y ca-certificates curl jq
1495+
- RESPONSE=$(curl -s -H "Accept:application/vnd.github+json" "https://api.github.com/repos/correaa/boost-multi/actions/workflows/ci.yml/runs?branch=${CI_COMMIT_BRANCH}&per_page=1")
1496+
- echo "GitHub API response $RESPONSE"
1497+
- STATUS=$(echo "$RESPONSE" | jq -r .workflow_runs[0].conclusion)
14961498
- echo "GitHub CI status $STATUS"
14971499
- test "$STATUS" = "success"
1498-
needs: ["g++","clang++","cuda","nvhpc","oneapi"]
1500+
needs: ["g++","cuda","nvhpc","clang++-latest tidy iwyu everything"]

include/boost/multi/array.hpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -793,8 +793,14 @@ using static_array [[deprecated("static_array has been renamed to dynamics_array
793793
#pragma clang diagnostic pop
794794
#endif
795795

796+
/// A specialization for zero dimensions
797+
///
798+
/// The array might or might not contain an element
799+
///
800+
/// @tparam T Element type
801+
/// @tparam Alloc Allocator type
796802
template<typename T, class Alloc>
797-
struct dynamic_array<T, ::boost::multi::dimensionality_type{0}, Alloc> // NOLINT(fuchsia-multiple-inheritance,misc-multiple-inheritance) : design
803+
struct dynamic_array<T, 0, Alloc> // NOLINT(fuchsia-multiple-inheritance,misc-multiple-inheritance) : design
798804
: protected detail::array_allocator<Alloc>
799805
, public array_ref<T, 0, typename multi::allocator_traits<typename detail::array_allocator<Alloc>::allocator_type>::pointer> {
800806
static_assert(std::is_same_v<typename multi::allocator_traits<Alloc>::value_type, typename dynamic_array::element_type>, "allocator value type must match array value type");

0 commit comments

Comments
 (0)