From 1546edc9bed5a4f82088578e73447699feed1216 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 27 Sep 2022 16:51:54 -0400 Subject: Fix field shadowing --- src/server/GraphImpl.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/server') diff --git a/src/server/GraphImpl.cpp b/src/server/GraphImpl.cpp index 86a70495..1ed6c37f 100644 --- a/src/server/GraphImpl.cpp +++ b/src/server/GraphImpl.cpp @@ -122,7 +122,7 @@ GraphImpl::duplicate(Engine& engine, } // Add duplicates of all arcs - for (const auto& a : _arcs) { + for (const auto& a : _graph_arcs) { auto arc = std::dynamic_pointer_cast(a.second); if (arc) { auto t = port_map.find(arc->tail()); @@ -285,17 +285,17 @@ void GraphImpl::add_arc(const std::shared_ptr& a) { ThreadManager::assert_thread(THREAD_PRE_PROCESS); - _arcs.emplace(std::make_pair(a->tail(), a->head()), a); + _graph_arcs.emplace(std::make_pair(a->tail(), a->head()), a); } std::shared_ptr GraphImpl::remove_arc(const PortImpl* tail, const PortImpl* dst_port) { ThreadManager::assert_thread(THREAD_PRE_PROCESS); - auto i = _arcs.find(std::make_pair(tail, dst_port)); - if (i != _arcs.end()) { + auto i = _graph_arcs.find(std::make_pair(tail, dst_port)); + if (i != _graph_arcs.end()) { auto arc = std::dynamic_pointer_cast(i->second); - _arcs.erase(i); + _graph_arcs.erase(i); return arc; } @@ -306,8 +306,8 @@ bool GraphImpl::has_arc(const PortImpl* tail, const PortImpl* dst_port) const { ThreadManager::assert_thread(THREAD_PRE_PROCESS); - auto i = _arcs.find(std::make_pair(tail, dst_port)); - return (i != _arcs.end()); + auto i = _graph_arcs.find(std::make_pair(tail, dst_port)); + return (i != _graph_arcs.end()); } void -- cgit v1.2.1