diff options
| author | David Robillard <d@drobilla.net> | 2022-09-27 16:51:54 -0400 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2022-09-27 16:51:54 -0400 |
| commit | 1546edc9bed5a4f82088578e73447699feed1216 (patch) | |
| tree | 0769ae7f048f9796c26740fc8c3c68ce3543027c /src/server | |
| parent | f4866b97d444dcdc6275a13f6be1f8a9e039d927 (diff) | |
| download | ingen-1546edc9bed5a4f82088578e73447699feed1216.tar.gz ingen-1546edc9bed5a4f82088578e73447699feed1216.tar.bz2 ingen-1546edc9bed5a4f82088578e73447699feed1216.zip | |
Fix field shadowing
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/GraphImpl.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
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<ArcImpl>(a.second); if (arc) { auto t = port_map.find(arc->tail()); @@ -285,17 +285,17 @@ void GraphImpl::add_arc(const std::shared_ptr<ArcImpl>& 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<ArcImpl> 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<ArcImpl>(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 |