Skip to content

Commit 98d65ee

Browse files
authored
Merge pull request #431 from jkeust/bugfix/compile-apple-clang-17
Fix compilation error using Apple Clang (version 17.0.0).
2 parents d033684 + ff8cf1e commit 98d65ee

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
2020
- Use the right table to store `configure-args` cmeel argument ([#403](https://github.com/Simple-Robotics/proxsuite/pull/403))
2121
- Allow project to be used as an external CMake project (FetchContent) ([#408](https://github.com/Simple-Robotics/proxsuite/pull/408))
2222
- Fix -Wdeprecated-literal-operator warning ([#420](https://github.com/Simple-Robotics/proxsuite/pull/420))
23+
- Fix compilation error with Apple Clang compiler ([#431](https://github.com/Simple-Robotics/proxsuite/pull/431))
2324

2425
### Removed
2526
- Don't release PyPy package on GNU/Linux anymore ([#403](https://github.com/Simple-Robotics/proxsuite/pull/403))

include/proxsuite/linalg/veg/tuple.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,8 @@ struct cat
754754
proxsuite::linalg::veg::meta::false_type /*unused*/,
755755
Tuples&&... tups) VEG_NOEXCEPT -> Concat<Tuples...>
756756
{
757-
#if defined(_MSC_VER) || (defined(__clang__) && __clang_major__ >= 19)
757+
#if defined(_MSC_VER) || (defined(__clang__) && __clang_major__ >= 19) || \
758+
(defined(__APPLE__) && defined(__clang__) && __clang_major__ >= 17)
758759
return cat::from_ref_to_result(
759760
Tag<proxsuite::linalg::veg::meta::type_sequence_cat<Tuple, Tuples...>>{},
760761
cat::apply(_detail::_tuple::tuple_fwd(VEG_FWD(tups))...));

0 commit comments

Comments
 (0)