Skip to content

Commit 276ec9a

Browse files
committed
fix warnings from Linux
1 parent 186c992 commit 276ec9a

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

QtSLiM/QtSLiMWindow.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5807,16 +5807,17 @@ void QtSLiMWindow::subpopSelectionDidChange(const QItemSelection & /* selected *
58075807

58085808
// then loop through subpops and update their selected state
58095809
auto subpopIter = subpops.begin();
5810-
bool all_selected = true, none_selected = true;
5810+
//bool all_selected = true;
5811+
bool none_selected = true;
58115812

58125813
for (size_t i = 0; i < subpopCount; ++i)
58135814
{
58145815
(*subpopIter)->gui_selected_ = rowSelectedState[i];
58155816

58165817
if ((*subpopIter)->gui_selected_)
58175818
none_selected = false;
5818-
else
5819-
all_selected = false;
5819+
//else
5820+
// all_selected = false;
58205821

58215822
subpopIter++;
58225823
}

core/species.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,8 +508,9 @@ slim_tick_t Species::_InitializePopulationFromTextFile(const char *p_file, Eidos
508508

509509
// As of SLiM 2.1, we change the generation as a side effect of loading; otherwise we can't correctly update our state here!
510510
// As of SLiM 3, we set the generation up here, before making any individuals, because we need it to be correct for the tree-seq recording code.
511-
// As of SLiM 4, we save and read the tick instead, and do not touch the cycle counter for the species; this decision may need to be revisited
511+
// As of SLiM 4, we set both the tick and the cycle, which are both saved to the file for version 7 and after.
512512
community_.SetTick(file_tick);
513+
SetCycle(file_cycle);
513514

514515
// Read and ignore initial stuff until we hit the Populations section
515516
int64_t file_version = 0; // initially unknown; we will leave this as 0 for versions < 3, for now

0 commit comments

Comments
 (0)