mirror of
https://github.com/conan-io/conan-center-index.git
synced 2025-05-09 03:54:45 +00:00
f56e052b6c
* Add onetbb/2022.0.0 support * onetbb: refactor test package * Add patch for mising tbb namespace Signed-off-by: Uilian Ries <uilianries@gmail.com> --------- Signed-off-by: Uilian Ries <uilianries@gmail.com> Co-authored-by: Luis Caro Campos <3535649+jcar87@users.noreply.github.com> Co-authored-by: Uilian Ries <uilianries@gmail.com>
39 lines
1.8 KiB
Diff
39 lines
1.8 KiB
Diff
From 9c9ace26863cf50853f39b2d0b78146d20a981a6 Mon Sep 17 00:00:00 2001
|
|
From: Ilya Isaev <ilya.isaev@intel.com>
|
|
Date: Fri, 1 Nov 2024 10:52:18 +0100
|
|
Subject: [PATCH] Fix flow_graph tests build when compiling with GCC 13.3
|
|
(#1543)
|
|
|
|
Signed-off-by: Isaev, Ilya <ilya.isaev@intel.com>
|
|
---
|
|
include/oneapi/tbb/detail/_flow_graph_impl.h | 2 +-
|
|
include/oneapi/tbb/flow_graph.h | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/include/oneapi/tbb/detail/_flow_graph_impl.h b/include/oneapi/tbb/detail/_flow_graph_impl.h
|
|
index 19e00a8ef1..55063b93e1 100644
|
|
--- a/include/oneapi/tbb/detail/_flow_graph_impl.h
|
|
+++ b/include/oneapi/tbb/detail/_flow_graph_impl.h
|
|
@@ -347,7 +347,7 @@ class graph : no_copy, public graph_proxy {
|
|
caught_exception = false;
|
|
try_call([this] {
|
|
my_task_arena->execute([this] {
|
|
- wait(my_wait_context_vertex.get_context(), *my_context);
|
|
+ d1::wait(my_wait_context_vertex.get_context(), *my_context);
|
|
});
|
|
cancelled = my_context->is_group_execution_cancelled();
|
|
}).on_exception([this] {
|
|
diff --git a/include/oneapi/tbb/flow_graph.h b/include/oneapi/tbb/flow_graph.h
|
|
index 20916fa7c2..5b438faabf 100644
|
|
--- a/include/oneapi/tbb/flow_graph.h
|
|
+++ b/include/oneapi/tbb/flow_graph.h
|
|
@@ -305,7 +305,7 @@ class receiver {
|
|
bool res = internal_try_put(t, message_metainfo{message_metainfo::waiters_type{&msg_wait_vertex}});
|
|
if (res) {
|
|
__TBB_ASSERT(graph_reference().my_context != nullptr, "No wait_context associated with the Flow Graph");
|
|
- wait(msg_wait_vertex.get_context(), *graph_reference().my_context);
|
|
+ d1::wait(msg_wait_vertex.get_context(), *graph_reference().my_context);
|
|
}
|
|
return res;
|
|
}
|