.

Author: traversc

include/io/tbb_flow_compat.h

@@ -2,14 +2,19 @@
 #define _QIO_TBB_FLOW_COMPAT_H
 
 #include <utility>
-#if __has_include(<tbb/version.h>)
-#include <tbb/version.h>
-#elif __has_include(<tbb/tbb_stddef.h>)
-#include <tbb/tbb_stddef.h>
+#include <tbb/flow_graph.h>
+
+// Derive the interface version from the same header tree that provided
+// flow_graph.h. Some packaged TBB layouts expose a newer version header while
+// still shipping the classic flow-graph API, so pre-reading version headers can
+// mis-detect the actual node interface in use.
+#ifndef TBB_INTERFACE_VERSION_MAJOR
+#ifdef TBB_INTERFACE_VERSION
+#define TBB_INTERFACE_VERSION_MAJOR (TBB_INTERFACE_VERSION / 1000)
 #else
-#error "Unable to find a TBB version header"
+#error "Unable to determine TBB interface version from flow_graph.h"
+#endif
 #endif
-#include <tbb/flow_graph.h>
 
 namespace qio {
 namespace tbb_compat {