Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

replace raw ptrs with std::unique_ptr<> in Prepare

Browse Source
This commit is contained in:
Dennis Luxen 2014-10-16 12:10:12 +02:00
parent fb81302382
commit 4b6cb0b8b8
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Contractor/Prepare.cpp
View File

@ -38,6 +38,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "../Util/GitDescription.h" #include "../Util/GitDescription.h"
#include "../Util/LuaUtil.h" #include "../Util/LuaUtil.h"
#include "../Util/make_unique.hpp"
#include "../Util/OSRMException.h" #include "../Util/OSRMException.h"
#include "../Util/simple_logger.hpp" #include "../Util/simple_logger.hpp"
#include "../Util/StringUtil.h" #include "../Util/StringUtil.h"
@ -194,7 +195,7 @@ int Prepare::Process(int argc, char *argv[])
*/ */
SimpleLogger().Write() << "initializing contractor"; SimpleLogger().Write() << "initializing contractor";
Contractor *contractor = new Contractor(number_of_edge_based_nodes, edge_based_edge_list); auto contractor = osrm::make_unique<Contractor>(number_of_edge_based_nodes, edge_based_edge_list);
TIMER_START(contraction); TIMER_START(contraction);
contractor->Run(); contractor->Run();
@ -204,7 +205,7 @@ int Prepare::Process(int argc, char *argv[])
DeallocatingVector<QueryEdge> contracted_edge_list; DeallocatingVector<QueryEdge> contracted_edge_list;
contractor->GetEdges(contracted_edge_list); contractor->GetEdges(contracted_edge_list);
delete contractor; contractor.reset();
/*** /***
* Sorting contracted edges in a way that the static query graph can read some in in-place. * Sorting contracted edges in a way that the static query graph can read some in in-place.