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/Event.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 'src/server/Event.hpp')
-rw-r--r-- | src/server/Event.hpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/server/Event.hpp b/src/server/Event.hpp index e2000d09..21af45c5 100644 --- a/src/server/Event.hpp +++ b/src/server/Event.hpp @@ -22,11 +22,11 @@ #include "raul/Deletable.hpp" #include "raul/Noncopyable.hpp" #include "raul/Path.hpp" -#include "raul/SharedPtr.hpp" #include "ingen/Interface.hpp" #include "ingen/Node.hpp" #include "ingen/Status.hpp" +#include "ingen/types.hpp" #include "types.hpp" @@ -81,7 +81,7 @@ public: Status status() const { return _status; } protected: - Event(Engine& engine, SharedPtr<Interface> client, int32_t id, FrameTime time) + Event(Engine& engine, SPtr<Interface> client, int32_t id, FrameTime time) : _engine(engine) , _next(NULL) , _request_client(client) @@ -122,13 +122,13 @@ protected: return _status; } - Engine& _engine; - std::atomic<Event*> _next; - SharedPtr<Interface> _request_client; - int32_t _request_id; - FrameTime _time; - Status _status; - std::string _err_subject; + Engine& _engine; + std::atomic<Event*> _next; + SPtr<Interface> _request_client; + int32_t _request_id; + FrameTime _time; + Status _status; + std::string _err_subject; }; } // namespace Server |