diff --git a/QtSLiM/QtSLiM_SLiMgui.cpp b/QtSLiM/QtSLiM_SLiMgui.cpp index 3f56b716..eb8624db 100644 --- a/QtSLiM/QtSLiM_SLiMgui.cpp +++ b/QtSLiM/QtSLiM_SLiMgui.cpp @@ -39,7 +39,7 @@ SLiMgui::SLiMgui(Community &p_community, QtSLiMWindow *p_controller) : community_(p_community), controller_(p_controller), - self_symbol_(gID_slimgui, EidosValue_SP(new (gEidosValuePool->AllocateChunk()) EidosValue_Object_singleton(this, gSLiM_SLiMgui_Class))) + self_symbol_(gID_slimgui, EidosValue_SP(new (gEidosValuePool->AllocateChunk()) EidosValue_Object(this, gSLiM_SLiMgui_Class))) { } @@ -73,7 +73,7 @@ EidosValue_SP SLiMgui::GetProperty(EidosGlobalStringID p_property_id) // constants case gID_pid: { - return EidosValue_SP(new (gEidosValuePool->AllocateChunk()) EidosValue_Int_singleton(getpid())); + return EidosValue_SP(new (gEidosValuePool->AllocateChunk()) EidosValue_Int(getpid())); } // variables diff --git a/eidos/eidos_value.cpp b/eidos/eidos_value.cpp index 413a9ceb..8eb440f2 100644 --- a/eidos/eidos_value.cpp +++ b/eidos/eidos_value.cpp @@ -1757,7 +1757,7 @@ void EidosValue_Float::erase_index(size_t p_index) std::vector gEidosValue_Object_Mutation_Registry; EidosValue_Object::EidosValue_Object(const EidosClass *p_class) : EidosValue(EidosValueType::kValueObject), - class_(p_class), values_(&singleton_value_), count_(0), capacity_(1) + values_(&singleton_value_), count_(0), capacity_(1), class_(p_class) { class_uses_retain_release_ = (class_ == gEidosObject_Class ? true : class_->UsesRetainRelease());