Commit 39afcb3
authored
guard tbb concepts-based iterator dispatch on __TBB_CPP20_CONCEPTS_PRESENT (#268)
parallel_for_each.h selected its concepts-based iterator_tag_dispatch on
__TBB_CPP20_PRESENT, which only tests the language mode (__TBB_LANG >=
202002L). Toolchains that accept -std=c++20 but ship a pre-C++20 standard
library then take the concepts branch and fail to find
std::random_access_iterator; this broke installation on CRAN's macOS
x86_64 machines, which pair Apple clang 14 with the macOS 11.3 SDK.
Every other C++20 library dependency in these headers is already gated on
__TBB_CPP20_CONCEPTS_PRESENT (or, for <compare>, on both the language and
library feature-test macros), so parallel_for_each.h was the lone
offender.
This mirrors the upstream fix from oneTBB PR #1611 (issue #1552), first
released in oneTBB 2022.1.0, and can be dropped once the bundled oneTBB
is updated past 2022.0.0.1 parent a3c7cd7 commit 39afcb3
3 files changed
Lines changed: 42 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
3 | 9 | | |
4 | 10 | | |
5 | 11 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
409 | 409 | | |
410 | 410 | | |
411 | 411 | | |
412 | | - | |
| 412 | + | |
413 | 413 | | |
414 | 414 | | |
415 | 415 | | |
| |||
448 | 448 | | |
449 | 449 | | |
450 | 450 | | |
451 | | - | |
| 451 | + | |
452 | 452 | | |
453 | 453 | | |
454 | 454 | | |
| |||
0 commit comments