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

Merge pull request #3669 from Project-OSRM/seemoritz-minor_fixes

Browse Source 
Port Seemoritz minor fixes to master
This commit is contained in:
Patrick Niklaus
2017-02-08 09:34:36 +00:00
committed by GitHub
parent 880b982eeb 0c04c6cafb
commit 768dc8d817
9 changed files with 41 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/engine/datafacade/contiguous_internalmem_datafacade.hpp
+4 -9
View File
@@ -859,18 +859,15 @@ class ContiguousInternalMemoryDataFacade : public BaseDataFacade
const unsigned end = m_geometry_indices.at(id + 1);
std::vector<DatasourceID> result_datasources;
result_datasources.resize(end - begin);
// If there was no datasource info, return an array of 0's.
if (m_datasource_list.empty())
{
for (unsigned i = 0; i < end - begin; ++i)
{
result_datasources.push_back(0);
}
result_datasources.resize(end - begin, 0);
}
else
{
result_datasources.resize(end - begin);
std::copy(m_datasource_list.begin() + begin,
m_datasource_list.begin() + end,
result_datasources.begin());
@@ -902,13 +899,11 @@ class ContiguousInternalMemoryDataFacade : public BaseDataFacade
// If there was no datasource info, return an array of 0's.
if (m_datasource_list.empty())
{
for (unsigned i = 0; i < end - begin; ++i)
{
result_datasources.push_back(0);
}
result_datasources.resize(end - begin, 0);
}
else
{
result_datasources.resize(end - begin);
std::copy(m_datasource_list.rbegin() + (m_datasource_list.size() - end),
m_datasource_list.rbegin() + (m_datasource_list.size() - begin),
result_datasources.begin());