From 0c8c78a324433431769cd8d4292c83f2fa55fbb1 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 15 Mar 2018 00:00:27 -0400 Subject: Use BlockSet type alias --- src/server/CompiledGraph.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/server/CompiledGraph.cpp b/src/server/CompiledGraph.cpp index 449e7aa0..71cf0831 100644 --- a/src/server/CompiledGraph.cpp +++ b/src/server/CompiledGraph.cpp @@ -83,7 +83,7 @@ CompiledGraph::compile_graph(GraphImpl* graph) ThreadManager::assert_thread(THREAD_PRE_PROCESS); // Start with sink nodes (no outputs, or connected only to graph outputs) - std::set blocks; + BlockSet blocks; for (auto& b : graph->blocks()) { // Mark all blocks as unvisited initially b.set_mark(BlockImpl::Mark::UNVISITED); @@ -96,7 +96,7 @@ CompiledGraph::compile_graph(GraphImpl* graph) // Keep compiling working set until all nodes are visited while (!blocks.empty()) { - std::set predecessors; + BlockSet predecessors; Task par(Task::Mode::PARALLEL); for (auto b : blocks) { @@ -142,10 +142,10 @@ check_feedback(const BlockImpl* root, BlockImpl* provider) } void -CompiledGraph::compile_provider(const BlockImpl* root, - BlockImpl* block, - Task& task, - std::set& k) +CompiledGraph::compile_provider(const BlockImpl* root, + BlockImpl* block, + Task& task, + BlockSet& k) { if (block->dependants().size() > 1) { /* Provider has other dependants, so this is the tail of a sequential task. @@ -169,9 +169,7 @@ CompiledGraph::compile_provider(const BlockImpl* root, } void -CompiledGraph::compile_block(BlockImpl* n, - Task& task, - std::set& k) +CompiledGraph::compile_block(BlockImpl* n, Task& task, BlockSet& k) { switch (n->get_mark()) { case BlockImpl::Mark::UNVISITED: -- cgit v1.2.1