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/client/ObjectModel.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/client/ObjectModel.cpp')
-rw-r--r-- | src/client/ObjectModel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client/ObjectModel.cpp b/src/client/ObjectModel.cpp index 51427f90..9fc22c03 100644 --- a/src/client/ObjectModel.cpp +++ b/src/client/ObjectModel.cpp @@ -73,7 +73,7 @@ ObjectModel::polyphonic() const * @a o as correct. The paths of the two models MUST be equal. */ void -ObjectModel::set(SharedPtr<ObjectModel> o) +ObjectModel::set(SPtr<ObjectModel> o) { assert(_path == o->path()); if (o->_parent) @@ -94,7 +94,7 @@ ObjectModel::set_path(const Raul::Path& p) } void -ObjectModel::set_parent(SharedPtr<ObjectModel> p) +ObjectModel::set_parent(SPtr<ObjectModel> p) { assert(_path.is_child_of(p->path())); _parent = p; |