Skip to content

Commit

Permalink
fixes to QtSLiM for previous changes
Browse files Browse the repository at this point in the history
  • Loading branch information
bhaller committed Dec 23, 2023
1 parent 202ae02 commit ce167dd
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions QtSLiM/QtSLiM_SLiMgui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
{
}

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion eidos/eidos_value.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1757,7 +1757,7 @@ void EidosValue_Float::erase_index(size_t p_index)
std::vector<EidosValue_Object *> 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());

Expand Down

0 comments on commit ce167dd

Please sign in to comment.