summaryrefslogtreecommitdiff
path: root/global.h
diff options
context:
space:
mode:
authortomsmeding <tom.smeding@gmail.com>2017-01-01 12:03:58 +0100
committertomsmeding <tom.smeding@gmail.com>2017-01-01 12:03:58 +0100
commit8906ff2e2755f6f8a2e52f5252afbcbea248c947 (patch)
treee684823e99b9182badcb49dd6c2e35409fe40d02 /global.h
parenta871e68ebd153d9ab4f9f9e36d7b099689e05c38 (diff)
instance_destroy that actually works; no more shared_ptr
Diffstat (limited to 'global.h')
-rw-r--r--global.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/global.h b/global.h
index 44e520a..eb8e7ea 100644
--- a/global.h
+++ b/global.h
@@ -1,7 +1,7 @@
#pragma once
+#include <set>
#include <vector>
-#include <memory>
#include "object_base.h"
@@ -10,5 +10,6 @@ using namespace std;
class Global{
public:
- vector<shared_ptr<Object>> objects;
+ set<Object*> objects;
+ vector<Object*> objects_todelete;
};