Skip to content

Commit 85bd0e5

Browse files
authored
Merge pull request #2200 from danrbailey/tbb2023
Update for TBB 2023
2 parents 32dcb29 + d68d091 commit 85bd0e5

2 files changed

Lines changed: 10 additions & 6 deletions

File tree

openvdb/openvdb/thread/Threading.h

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,16 @@
1414
#endif
1515

1616

17-
/// @note tbb/blocked_range.h is the ONLY include that persists from TBB 2020
18-
/// to TBB 2021 that itself includes the TBB specific version header files.
19-
/// In TBB 2020, the version header was called tbb/stddef.h. In 2021, it's
20-
/// called tbb/version.h. We include tbb/blocked_range.h here to indirectly
21-
/// access the version defines in a consistent way so that downstream
22-
/// software doesn't need to provide compile time defines.
2317
#include <tbb/blocked_range.h>
2418
#include <tbb/task.h>
19+
/// @note tbb/task_arena.h is the ONLY include that persists from TBB 2020
20+
/// to TBB 2021 to TBB 2023 that itself includes the TBB specific version
21+
/// header files.
22+
/// In TBB 2020, the version header was called tbb/stddef.h. In 2021+, it's
23+
/// called tbb/version.h. We include tbb/task_arena.h here to indirectly
24+
/// access the version defines in a consistent way so that downstream
25+
/// software doesn't need to provide compile time defines.
26+
#include <tbb/task_arena.h>
2527
#include <tbb/task_group.h>
2628

2729
namespace openvdb {

pendingchanges/tbb2023.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Build:
2+
- OpenVDB now builds against TBB 2023.

0 commit comments

Comments
 (0)