maelstrom/openblocks
1
1
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix: AddChild had wrong implementation and enable_shared_from_this was not correctly inherited

Browse source
This commit is contained in:
maelstrom 2025-01-18 00:11:00 +01:00
parent 1daed5bb83
commit 6522a887f9
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/objects/base/instance.h
View file

@ -12,7 +12,10 @@ struct InstanceType {
}; };
// Base class for all instances in the data model // Base class for all instances in the data model
class Instance : std::enable_shared_from_this<Instance> { // Note: enable_shared_from_this HAS to be public or else its field will not be populated
// Maybe this could be replaced with a friendship? But that seems unnecessary.
// https://stackoverflow.com/q/56415222/16255372
class Instance : public std::enable_shared_from_this<Instance> {
private: private:
std::optional<std::weak_ptr<Instance>> parent; std::optional<std::weak_ptr<Instance>> parent;
std::vector<std::shared_ptr<Instance>> children; std::vector<std::shared_ptr<Instance>> children;
@ -30,7 +33,7 @@ public:
inline const std::vector<std::shared_ptr<Instance>> GetChildren() { return children; } inline const std::vector<std::shared_ptr<Instance>> GetChildren() { return children; }
// Utility functions // Utility functions
inline void AddChild(std::shared_ptr<Instance> object) { children.push_back(object); } inline void AddChild(std::shared_ptr<Instance> object) { object->SetParent(this->shared_from_this()); }
}; };
typedef std::shared_ptr<Instance> InstanceRef; typedef std::shared_ptr<Instance> InstanceRef;