summaryrefslogtreecommitdiff
path: root/src/core/model
diff options
context:
space:
mode:
authorAndreas Stöckel <astoecke@techfak.uni-bielefeld.de>2014-12-16 02:34:36 +0100
committerAndreas Stöckel <astoecke@techfak.uni-bielefeld.de>2014-12-16 02:34:36 +0100
commitc6aa669aac80466ea287e9a27348c1068cc1f17e (patch)
treed72a74f50bf8a56ee267585635a4d7df73b9b277 /src/core/model
parent71346efac9d56a8753ee9032f7f96aa90fba9959 (diff)
changed paths to new location of the Managed class, adapted NodeVector and NodeMap to the slightly changed conditions in the Node class
Diffstat (limited to 'src/core/model')
-rw-r--r--src/core/model/Domain.hpp2
-rw-r--r--src/core/model/Typesystem.hpp3
2 files changed, 2 insertions, 3 deletions
diff --git a/src/core/model/Domain.hpp b/src/core/model/Domain.hpp
index 565313f..40b48c6 100644
--- a/src/core/model/Domain.hpp
+++ b/src/core/model/Domain.hpp
@@ -27,7 +27,7 @@
#ifndef _OUSIA_MODEL_DOMAIN_HPP_
#define _OUSIA_MODEL_DOMAIN_HPP_
-#include <core/ManagedContainers.hpp>
+#include <core/managed/ManagedContainer.hpp>
#include <core/Node.hpp>
namespace ousia {
diff --git a/src/core/model/Typesystem.hpp b/src/core/model/Typesystem.hpp
index 77a862b..347adb8 100644
--- a/src/core/model/Typesystem.hpp
+++ b/src/core/model/Typesystem.hpp
@@ -30,7 +30,6 @@
#include <map>
#include <vector>
-#include <core/ManagedContainers.hpp>
#include <core/Node.hpp>
#include <core/common/Exceptions.hpp>
#include <core/common/Logger.hpp>
@@ -361,7 +360,7 @@ public:
class Typesystem : public Node {
private:
- ManagedVector<Type> types;
+ NodeVector<Type> types;
public:
Typesystem(Manager &mgr, std::string name, Handle<Node> parent = nullptr)