Skip to content

Commit 1fceec9

Browse files
committed
Minor build fix for C++20/GCC13 and weekly CI fixes
Signed-off-by: Nick Avramoussis <[email protected]>
1 parent 9acc3af commit 1fceec9

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.github/workflows/weekly.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -192,21 +192,21 @@ jobs:
192192
strategy:
193193
matrix:
194194
config:
195-
- { runson: ubuntu-latest, cxx: g++, cmake: '' }
195+
- { runson: ubuntu-latest, cxx: g++, cmake: '' }
196196
# Disable the clang job for now. See https://github.com/actions/runner-images/issues/8659
197197
# - { runson: ubuntu-latest, cxx: clang++, cmake: '' }
198198
# @todo gcc on macos
199-
- { runson: macos-latest, cxx: '', cmake: '-DCMAKE_CXX_COMPILER=/opt/homebrew/opt/llvm@15/bin/clang++ -DLLVM_DIR=/opt/homebrew/opt/llvm@15/lib/cmake/llvm' }
199+
- { runson: macos-latest, cxx: '', cmake: '-DLLVM_DIR=/opt/homebrew/opt/llvm@20/lib/cmake/llvm' }
200200
fail-fast: false
201201
steps:
202202
- uses: actions/checkout@v3
203203
- name: install_deps
204204
run: |
205205
if [ "$RUNNER_OS" == "Linux" ]; then
206-
sudo apt-get -q install -y libboost-dev libboost-iostreams-dev libtbb-dev libblosc-dev llvm-15-dev libgtest-dev libgmock-dev libcppunit-dev
206+
sudo apt-get -q install -y libboost-dev libboost-iostreams-dev libtbb-dev libblosc-dev llvm-dev libgtest-dev libgmock-dev libcppunit-dev
207207
./ci/install_nanobind.sh 2.0.0
208208
elif [ "$RUNNER_OS" == "macOS" ]; then
209-
./ci/install_macos.sh 15
209+
./ci/install_macos.sh 20
210210
./ci/install_tbb_macos.sh
211211
else
212212
echo "$RUNNER_OS not supported"; exit 1

openvdb/openvdb/tools/impl/ConvexVoxelizer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -881,7 +881,7 @@ class ConvexVoxelizer
881881
Op(TreeT &tree) : mDelete(false), mTree(&tree) {}
882882
Op(const Op& other, tbb::split) : mDelete(true), mTree(new TreeT(other.mTree->background())) {}
883883
~Op() { if (mDelete) delete mTree; }
884-
void operator()(RangeT &r) { for (auto i=r.begin(); i!=r.end(); ++i) this->merge(*i);}
884+
void operator()(const RangeT &r) { for (auto i=r.begin(); i!=r.end(); ++i) this->merge(*i);}
885885
void join(Op &other) { this->merge(*(other.mTree)); }
886886
void merge(TreeT &tree) { mTree->merge(tree, MERGE_ACTIVE_STATES); }
887887
} op( getTree() );

0 commit comments

Comments
 (0)