Skip to content

Commit 407e2ae

Browse files
committed
fixes for icpx
1 parent 1d97137 commit 407e2ae

4 files changed

Lines changed: 7 additions & 13 deletions

File tree

.gitlab-ci-correaa.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1529,6 +1529,7 @@ mrdocs:
15291529
- ls -all
15301530
- export PATH=$PWD/MrDocs-0.8.0-Linux/bin:$PATH
15311531
- mrdocs --version
1532+
- mrdocs --help
15321533
- cmake -B build-mrdocs
15331534
-DCMAKE_CXX_COMPILER=clang++
15341535
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON
@@ -1542,14 +1543,12 @@ mrdocs:
15421543
- doc/modules/reference/pages
15431544
expire_in: 1 week
15441545
needs: ["clang++"]
1546+
# see result of MrDocs here: https://correaa.gitlab.io/boost-multi/multi/reference/index.html
15451547

15461548
antora:
15471549
image: antora/antora
15481550
stage: build
15491551
allow_failure: false
1550-
# only:
1551-
# refs:
1552-
# - develop
15531552
tags:
15541553
- non-shared
15551554
- docker
@@ -1558,10 +1557,6 @@ antora:
15581557
script:
15591558
# - apt-get -qq update && apt-get -qq install --no-install-recommends -y --quiet make clang cmake tree ca-certificates npm asciidoctor sed git pip python3 python3-venv wget # pandoc ruby-rouge
15601559
# - npm i -q @antora/cli @antora/site-generator
1561-
# - wget https://github.com/cppalliance/mrdocs/releases/download/v0.8.0/MrDocs-0.8.0-Linux.tar.gz # https://github.com/cppalliance/mrdocs/releases/download/v0.8.0/MrDocs-0.8.0-Darwin.tar.gz
1562-
# - tar zxvf MrDocs-0.8.0-Linux.tar.gz
1563-
# - export PATH=MrDocs-0.8.0-Linux/bin:$PATH
1564-
# - truncate -s 0 doc/modules/.gitignore # allow Antora to see MrDocs-generated pages
15651560
- cd doc
15661561
- tree .
15671562
- npm ci --ignore-scripts
@@ -1576,13 +1571,13 @@ antora:
15761571
artifacts:
15771572
paths:
15781573
- public
1579-
# check for file here: https://correaa.gitlab.io/boost-multi/boost-multi.hpp
15801574
needs:
15811575
- job: pages-presentation
15821576
artifacts: true
15831577
- job: mrdocs
15841578
artifacts: true
15851579
optional: true # mrdocs is allow_failure; antora can still run without its artifacts
1580+
# see result of antora doc in https://correaa.gitlab.io/boost-multi/multi/intro.html
15861581

15871582
# this is a specially named workflow ("pages") populates the pages site
15881583
pages:

include/boost/multi/detail/static_allocator.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class offset_ptr {
7474
using iterator_concept = std::contiguous_iterator_tag;
7575
#endif
7676

77-
#if defined(__clang_major__) && __clang_major__ >= 16
77+
#ifdef __clang__
7878
#pragma clang diagnostic push
7979
#pragma clang diagnostic ignored "-Wunsafe-buffer-usage" // offset_ptr does T*+Diff arithmetic by design
8080
#endif
@@ -83,7 +83,7 @@ class offset_ptr {
8383
assert(ptr_ != nullptr || offset_ == 0);
8484
return ptr_ + offset_; // NOLINT(cppcoreguidelines-pro-bounds-pointer-arithmetic)
8585
}
86-
#if defined(__clang_major__) && __clang_major__ >= 16
86+
#ifdef __clang__
8787
#pragma clang diagnostic pop
8888
#endif
8989
constexpr auto operator*() const noexcept -> reference { return *operator->(); }

mrdocs.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ multipage: true
1717

1818
extract-private: false
1919

20-
inherit-base-members: "reference"
21-
#"copy-all"
20+
# inherit-base-members: "copy-dependencies" # "reference" "copy-all"
2221

2322
base-url: https://gitlab.com/correaa/boost-multi/-/blob/develop/include/
2423

test/allocator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ libs/boost-multi/test/allocator.cpp:378:18: note: declared here
443443
// constexpr_allocator
444444
{
445445
constexpr auto gg = g();
446-
static_assert(gg == 10);
446+
// static_assert(gg == 10);
447447
BOOST_TEST( gg == 10 );
448448
}
449449
#endif

0 commit comments

Comments
 (0)