From bdbdf42f3fe990c713c5437724db39274c387eee Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 2 Aug 2020 15:23:19 +0200 Subject: Remove std::shared_ptr alias --- include/ingen/Store.hpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'include/ingen/Store.hpp') diff --git a/include/ingen/Store.hpp b/include/ingen/Store.hpp index fd801b02..46bec770 100644 --- a/include/ingen/Store.hpp +++ b/include/ingen/Store.hpp @@ -18,12 +18,12 @@ #define INGEN_STORE_HPP #include "ingen/ingen.h" -#include "ingen/memory.hpp" #include "raul/Deletable.hpp" #include "raul/Noncopyable.hpp" #include "raul/Path.hpp" #include +#include #include #include @@ -36,9 +36,10 @@ class Node; /** Store of objects in the graph hierarchy. * @ingroup IngenShared */ -class INGEN_API Store : public Raul::Noncopyable - , public Raul::Deletable - , public std::map< const Raul::Path, SPtr > { +class INGEN_API Store : public Raul::Noncopyable, + public Raul::Deletable, + public std::map> +{ public: void add(Node* o); @@ -48,13 +49,13 @@ public: } using const_range = std::pair; - using Objects = std::map>; + using Objects = std::map>; using Mutex = std::recursive_mutex; iterator find_descendants_end(Store::iterator parent); const_iterator find_descendants_end(Store::const_iterator parent) const; - const_range children_range(const SPtr& o) const; + const_range children_range(const std::shared_ptr& o) const; /** Remove the object at `top` and all its children from the store. * -- cgit v1.2.1