diff options
| author | David Robillard <d@drobilla.net> | 2013-01-12 23:38:03 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2013-01-12 23:38:03 +0000 |
| commit | df1447c665e6c3631961297a9d3e9aff4e94c47f (patch) | |
| tree | c0ff117c362e6d571f430f886ab62f372b59af08 /src/server/GraphImpl.cpp | |
| parent | bb335dca695273622b7a4ebbefbe9e089edb9ab4 (diff) | |
| download | ingen-df1447c665e6c3631961297a9d3e9aff4e94c47f.tar.gz ingen-df1447c665e6c3631961297a9d3e9aff4e94c47f.tar.bz2 ingen-df1447c665e6c3631961297a9d3e9aff4e94c47f.zip | |
Remove Raul::SharedPtr and switch to std::shared_ptr.
Use project local short type aliases for shared_ptr and friends.
Move Raul::Disposable and Raul::Manageable into Raul::Maid.
Use sets to store machina nodes and edges to avoid O(n) searches.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4939 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/server/GraphImpl.cpp')
| -rw-r--r-- | src/server/GraphImpl.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/GraphImpl.cpp b/src/server/GraphImpl.cpp index 14af654c..081b5b16 100644 --- a/src/server/GraphImpl.cpp +++ b/src/server/GraphImpl.cpp @@ -198,7 +198,7 @@ GraphImpl::remove_block(BlockImpl& block) } void -GraphImpl::add_arc(SharedPtr<ArcImpl> a) +GraphImpl::add_arc(SPtr<ArcImpl> a) { ThreadManager::assert_thread(THREAD_PRE_PROCESS); _arcs.insert(make_pair(make_pair(a->tail(), a->head()), a)); @@ -207,17 +207,17 @@ GraphImpl::add_arc(SharedPtr<ArcImpl> a) /** Remove an arc. * Preprocessing thread only. */ -SharedPtr<ArcImpl> +SPtr<ArcImpl> GraphImpl::remove_arc(const PortImpl* tail, const PortImpl* dst_port) { ThreadManager::assert_thread(THREAD_PRE_PROCESS); Arcs::iterator i = _arcs.find(make_pair(tail, dst_port)); if (i != _arcs.end()) { - SharedPtr<ArcImpl> arc = PtrCast<ArcImpl>(i->second); + SPtr<ArcImpl> arc = dynamic_ptr_cast<ArcImpl>(i->second); _arcs.erase(i); return arc; } else { - return SharedPtr<ArcImpl>(); + return SPtr<ArcImpl>(); } } |