fix tbb compat

traversc · traversc · commit 9876524cf44b · 2026-03-25T14:10:36.000-07:00
diff --git a/include/io/multithreaded_block_module.h b/include/io/multithreaded_block_module.h
@@ -314,7 +314,7 @@ struct BlockCompressReaderMT {
         OrderedBlock block;
         while( true ) {
             if( sequencer_node.try_get(block) ) {
-                decompressor_limiter_node.decrementer().try_put(tbb::flow::continue_msg{});
+                qio::tbb_compat::decrementer(decompressor_limiter_node).try_put(tbb::flow::continue_msg{});
                 available_blocks.push(current_block);
                 current_block = block.block;
                 current_blocksize = block.blocksize;
diff --git a/include/io/tbb_flow_compat.h b/include/io/tbb_flow_compat.h
@@ -4,30 +4,35 @@
 #include <utility>
 #if __has_include(<tbb/version.h>)
 #include <tbb/version.h>
-#elif __has_include(<oneapi/tbb/version.h>)
-#include <oneapi/tbb/version.h>
+#elif __has_include(<tbb/tbb_stddef.h>)
+#include <tbb/tbb_stddef.h>
+#else
+#error "Unable to find a TBB version header"
 #endif
 #include <tbb/flow_graph.h>
 
 namespace qio {
 namespace tbb_compat {
 
-// Normalize old TBB flow-graph source APIs across versions.
+// Normalize the flow-graph API split between classic TBB (interface 11)
+// and oneTBB (interface 12+).
 //
-// Old interface:
+// Classic TBB:
 //   tbb::flow::source_node<T>
+//   limiter_node.decrement
 //   body signature: bool(T & out)
 //
-// Newer interface:
+// oneTBB:
 //   tbb::flow::input_node<T>
+//   limiter_node.decrementer()
 //   body signature: T(tbb::flow_control & fc)
 //
 // Normalized contract used below:
 //   bool(T & out)
 //
 // Return true and fill `out` to emit one message.
 // Return false to stop the node.
-#if defined(TBB_INTERFACE_VERSION) && TBB_INTERFACE_VERSION >= 11102
+#if defined(TBB_INTERFACE_VERSION_MAJOR) && TBB_INTERFACE_VERSION_MAJOR >= 12
 template <class T>
 struct source_node : tbb::flow::input_node<T> {
     using base_type = tbb::flow::input_node<T>;
@@ -43,6 +48,11 @@ struct source_node : tbb::flow::input_node<T> {
         return out;
     }) {}
 };
+
+template <class LimiterNode>
+inline auto & decrementer(LimiterNode & node) {
+    return node.decrementer();
+}
 #else
 template <class T>
 struct source_node : tbb::flow::source_node<T> {
@@ -52,6 +62,11 @@ struct source_node : tbb::flow::source_node<T> {
     source_node(tbb::flow::graph & graph, Body && body) :
     base_type(graph, std::forward<Body>(body), false) {}
 };
+
+template <class LimiterNode>
+inline auto & decrementer(LimiterNode & node) {
+    return node.decrement;
+}
 #endif
 
 } // namespace tbb_compat
