dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Linkgraph: Refactoring to avoid manual deletes.

Browse Source
This commit is contained in:
Jonathan G Rennison
2017-02-08 19:47:37 +00:00
parent 28211c21fc
commit 2080daab8d
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/linkgraph/linkgraphschedule.cpp
View File

@@ -212,12 +212,12 @@ void LinkGraphSchedule::ShiftDates(int interval)
*/
LinkGraphSchedule::LinkGraphSchedule()
{
this->handlers[0] = new InitHandler;
this->handlers[1] = new DemandHandler;
this->handlers[2] = new MCFHandler<MCF1stPass>;
this->handlers[3] = new FlowMapper(false);
this->handlers[4] = new MCFHandler<MCF2ndPass>;
this->handlers[5] = new FlowMapper(true);
this->handlers[0].reset(new InitHandler);
this->handlers[1].reset(new DemandHandler);
this->handlers[2].reset(new MCFHandler<MCF1stPass>);
this->handlers[3].reset(new FlowMapper(false));
this->handlers[4].reset(new MCFHandler<MCF2ndPass>);
this->handlers[5].reset(new FlowMapper(true));
}
/**
@@ -226,9 +226,6 @@ LinkGraphSchedule::LinkGraphSchedule()
LinkGraphSchedule::~LinkGraphSchedule()
{
this->Clear();
for (uint i = 0; i < lengthof(this->handlers); ++i) {
delete this->handlers[i];
}
}
LinkGraphJobGroup::LinkGraphJobGroup(constructor_token token, std::vector<LinkGraphJob *> jobs) :

2
src/linkgraph/linkgraphschedule.h
View File

@@ -46,7 +46,7 @@ private:
friend const SaveLoad *GetLinkGraphScheduleDesc();
protected:
ComponentHandler *handlers[6]; ///< Handlers to be run for each job.
std::unique_ptr<ComponentHandler> handlers[6]; ///< Handlers to be run for each job.
GraphList schedule; ///< Queue for new jobs.
JobList running; ///< Currently running jobs.