summaryrefslogtreecommitdiffstats
path: root/src/server/BlockFactory.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/BlockFactory.hpp')
-rw-r--r--src/server/BlockFactory.hpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/server/BlockFactory.hpp b/src/server/BlockFactory.hpp
index 234a20fa..68699d8a 100644
--- a/src/server/BlockFactory.hpp
+++ b/src/server/BlockFactory.hpp
@@ -17,11 +17,11 @@
#ifndef INGEN_ENGINE_BLOCKFACTORY_HPP
#define INGEN_ENGINE_BLOCKFACTORY_HPP
-#include "ingen/URI.hpp"
-#include "ingen/types.hpp"
-#include "raul/Noncopyable.hpp"
+#include <ingen/URI.hpp>
+#include <raul/Noncopyable.hpp>
#include <map>
+#include <memory>
#include <set>
namespace ingen {
@@ -36,7 +36,7 @@ class PluginImpl;
*
* \ingroup engine
*/
-class BlockFactory : public Raul::Noncopyable
+class BlockFactory : public raul::Noncopyable
{
public:
explicit BlockFactory(ingen::World& world);
@@ -47,11 +47,11 @@ public:
*
* @return The set of newly loaded plugins.
*/
- std::set<SPtr<PluginImpl>> refresh();
+ std::set<std::shared_ptr<PluginImpl>> refresh();
void load_plugin(const URI& uri);
- using Plugins = std::map<URI, SPtr<PluginImpl>>;
+ using Plugins = std::map<URI, std::shared_ptr<PluginImpl>>;
const Plugins& plugins();
PluginImpl* plugin(const URI& uri);
@@ -62,7 +62,7 @@ private:
Plugins _plugins;
ingen::World& _world;
- bool _has_loaded;
+ bool _has_loaded{false};
};
} // namespace server