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 /ingen/Store.hpp | |
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 'ingen/Store.hpp')
-rw-r--r-- | ingen/Store.hpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ingen/Store.hpp b/ingen/Store.hpp index c176cdd3..dcab2532 100644 --- a/ingen/Store.hpp +++ b/ingen/Store.hpp @@ -22,10 +22,12 @@ #undef nil #include <glibmm/thread.h> -#include "ingen/Node.hpp" #include "raul/Deletable.hpp" #include "raul/Noncopyable.hpp" +#include "ingen/Node.hpp" +#include "ingen/types.hpp" + namespace Ingen { /** Store of objects in the graph hierarchy. @@ -33,7 +35,7 @@ namespace Ingen { */ class Store : public Raul::Noncopyable , public Raul::Deletable - , public std::map< const Raul::Path, SharedPtr<Node> > { + , public std::map< const Raul::Path, SPtr<Node> > { public: void add(Node* o); @@ -44,12 +46,12 @@ public: typedef std::pair<const_iterator, const_iterator> const_range; - typedef std::map< Raul::Path, SharedPtr<Node> > Objects; + typedef std::map< Raul::Path, SPtr<Node> > Objects; iterator find_descendants_end(Store::iterator parent); const_iterator find_descendants_end(Store::const_iterator parent) const; - const_range children_range(SharedPtr<const Node> o) const; + const_range children_range(SPtr<const Node> o) const; /** Remove the object at @p top and all its children from the store. * |