1 files changed, 9 insertions, 15 deletions
diff --git a/src/server/CompiledGraph.hpp b/src/server/CompiledGraph.hpp
index f33941aa..1949563d 100644
--- a/src/server/CompiledGraph.hpp
+++ b/src/server/CompiledGraph.hpp
@@ -19,16 +19,14 @@
 
 #include "Task.hpp"
 
-#include "raul/Maid.hpp"
-#include "raul/Noncopyable.hpp"
+#include <raul/Noncopyable.hpp>
 
 #include <cstddef>
 #include <memory>
 #include <set>
 #include <string>
 
-namespace ingen {
-namespace server {
+namespace ingen::server {
 
 class BlockImpl;
 class GraphImpl;
@@ -40,18 +38,15 @@ class RunContext;
  * execute the nodes in order and have nodes always executed before any of
  * their dependencies.
  */
-class CompiledGraph : public raul::Maid::Disposable
-                    , public raul::Noncopyable
+class CompiledGraph : public raul::Noncopyable
 {
 public:
-	static raul::managed_ptr<CompiledGraph> compile(raul::Maid& maid, GraphImpl& graph);
+	static std::unique_ptr<CompiledGraph> compile(GraphImpl& graph);
 
 	void run(RunContext& ctx);
 
 private:
-	friend class raul::Maid; ///< Allow make_managed to construct
-
-	CompiledGraph(GraphImpl* graph);
+	explicit CompiledGraph(GraphImpl* graph);
 
 	using BlockSet = std::set<BlockImpl*>;
 
@@ -73,13 +68,12 @@ private:
 	std::unique_ptr<Task> _master;
 };
 
-inline raul::managed_ptr<CompiledGraph>
-compile(raul::Maid& maid, GraphImpl& graph)
+inline std::unique_ptr<CompiledGraph>
+compile(GraphImpl& graph)
 {
-	return CompiledGraph::compile(maid, graph);
+	return CompiledGraph::compile(graph);
 }
 
-} // namespace server
-} // namespace ingen
+} // namespace ingen::server
 
 #endif // INGEN_ENGINE_COMPILEDGRAPH_HPP