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

fix(instance): not compiling due to bad usage of std::make_shared

Browse source
This commit is contained in:
maelstrom 2025-06-05 16:56:25 +02:00
parent f5931c746d
commit 253c617d19
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/src/objects/base/instance.cpp
View file

@ -261,6 +261,7 @@ std::vector<std::string> Instance::GetProperties() {
// Serialization // Serialization
void Instance::Serialize(pugi::xml_node parent, RefStateSerialize state) { void Instance::Serialize(pugi::xml_node parent, RefStateSerialize state) {
if (state == nullptr) state = std::make_shared<__RefStateSerialize>();
pugi::xml_node node = parent.append_child("Item"); pugi::xml_node node = parent.append_child("Item");
node.append_attribute("class").set_value(this->GetClass()->className); node.append_attribute("class").set_value(this->GetClass()->className);
@ -313,6 +314,7 @@ void Instance::Serialize(pugi::xml_node parent, RefStateSerialize state) {
} }
result<std::shared_ptr<Instance>, NoSuchInstance> Instance::Deserialize(pugi::xml_node node, RefStateDeserialize state) { result<std::shared_ptr<Instance>, NoSuchInstance> Instance::Deserialize(pugi::xml_node node, RefStateDeserialize state) {
if (state == nullptr) state = std::make_shared<__RefStateDeserialize>();
std::string className = node.attribute("class").value(); std::string className = node.attribute("class").value();
if (INSTANCE_MAP.count(className) == 0) { if (INSTANCE_MAP.count(className) == 0) {
return NoSuchInstance(className); return NoSuchInstance(className);
@ -433,6 +435,7 @@ DescendantsIterator::self_type DescendantsIterator::operator++(int _) {
} }
std::optional<std::shared_ptr<Instance>> Instance::Clone(RefStateClone state) { std::optional<std::shared_ptr<Instance>> Instance::Clone(RefStateClone state) {
if (state == nullptr) state = std::make_shared<__RefStateClone>();
std::shared_ptr<Instance> newInstance = GetClass()->constructor(); std::shared_ptr<Instance> newInstance = GetClass()->constructor();
// Copy properties // Copy properties

6
core/src/objects/base/instance.h
View file

@ -133,9 +133,9 @@ public:
} }
// Serialization // Serialization
void Serialize(pugi::xml_node parent, RefStateSerialize state = std::make_shared<__RefStateSerialize>()); void Serialize(pugi::xml_node parent, RefStateSerialize state = {});
static result<std::shared_ptr<Instance>, NoSuchInstance> Deserialize(pugi::xml_node node, RefStateDeserialize state = std::make_shared<__RefStateDeserialize>()); static result<std::shared_ptr<Instance>, NoSuchInstance> Deserialize(pugi::xml_node node, RefStateDeserialize state = {});
std::optional<std::shared_ptr<Instance>> Clone(RefStateClone state = std::make_shared<__RefStateClone>()); std::optional<std::shared_ptr<Instance>> Clone(RefStateClone state = {});
}; };
// https://gist.github.com/jeetsukumaran/307264 // https://gist.github.com/jeetsukumaran/307264