Skip to content

Commit 39005f6

Browse files
committed
fix build errors
1 parent 27eaecc commit 39005f6

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

core/individual.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ Individual::Individual(Subpopulation *p_subpopulation, slim_popsize_t p_individu
8484

8585
// Set up per-trait information such as phenotype caches and individual offsets
8686
Species &species = subpopulation_->species_;
87-
std::vector<Trait *> &traits = species.traits_;
87+
const std::vector<Trait *> &traits = species.Traits();
8888
int trait_count = (int)traits.size();
8989

9090
if (trait_count == 1)
@@ -3105,6 +3105,7 @@ EidosValue_SP Individual::ExecuteMethod_haplosomesForChromosomes(EidosGlobalStri
31053105
//
31063106
EidosValue_SP Individual::ExecuteMethod_offsetForTrait(EidosGlobalStringID p_method_id, const std::vector<EidosValue_SP> &p_arguments, EidosInterpreter &p_interpreter)
31073107
{
3108+
#pragma unused (p_method_id, p_interpreter)
31083109
EidosValue *trait_value = p_arguments[0].get();
31093110

31103111
// get the trait indices, with bounds-checking
@@ -4025,6 +4026,7 @@ EidosValue_SP Individual_Class::ExecuteClassMethod(EidosGlobalStringID p_method_
40254026
//
40264027
EidosValue_SP Individual_Class::ExecuteMethod_setOffsetForTrait(EidosGlobalStringID p_method_id, EidosValue_Object *p_target, const std::vector<EidosValue_SP> &p_arguments, EidosInterpreter &p_interpreter) const
40274028
{
4029+
#pragma unused (p_method_id, p_interpreter)
40284030
EidosValue *trait_value = p_arguments[0].get();
40294031
EidosValue *offset_value = p_arguments[1].get();
40304032

@@ -4052,7 +4054,7 @@ EidosValue_SP Individual_Class::ExecuteMethod_setOffsetForTrait(EidosGlobalStrin
40524054
// pattern 1: setting the default offset value for each trait in one or more individuals
40534055
for (int64_t trait_index : trait_indices)
40544056
{
4055-
Trait *trait = species->traits_[trait_index];
4057+
Trait *trait = species->Traits()[trait_index];
40564058
slim_effect_t offset = trait->DefaultOffset();
40574059

40584060
for (int individual_index = 0; individual_index < individuals_count; ++individual_index)

0 commit comments

Comments
 (0)