|
13 | 13 | #define OPENVDB_THREAD_THREADING_RESTORE_DEPRECATION_MESSAGE_TASK |
14 | 14 | #endif |
15 | 15 |
|
| 16 | +/// @warning the below changes what includes are available from this header |
| 17 | +/// depending on whether version.h is available |
| 18 | +#if __has_include(<tbb/version.h>) |
| 19 | + #include <tbb/version.h> |
| 20 | +#else |
| 21 | + /// @note tbb/task_arena.h is the ONLY include that persists from TBB 2020 |
| 22 | + /// to TBB 2021 to TBB 2023 that itself includes the TBB specific version |
| 23 | + /// header files. |
| 24 | + /// In TBB 2020, the version header was called tbb/stddef.h. In 2021+, it's |
| 25 | + /// called tbb/version.h. We include tbb/task_arena.h here to indirectly |
| 26 | + /// access the version defines in a consistent way so that downstream |
| 27 | + /// software doesn't need to provide compile time defines. |
| 28 | + #include <tbb/task_arena.h> |
| 29 | +#endif |
16 | 30 |
|
| 31 | +#include <tbb/task_group.h> |
17 | 32 | #include <tbb/blocked_range.h> |
18 | 33 | #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> |
27 | | -#include <tbb/task_group.h> |
28 | | -#include <tbb/version.h> |
29 | 34 |
|
30 | 35 | namespace openvdb { |
31 | 36 | OPENVDB_USE_VERSION_NAMESPACE |
|
0 commit comments