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

Use unsigned long long for 32bit

Browse Source
This commit is contained in:
Patrick Niklaus 2017-03-06 16:57:27 +00:00 committed by Patrick Niklaus
parent 1f39d936c5
commit c8bd01caae
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/partition/bisection_to_partition.cpp
View File

@ -18,7 +18,7 @@ static constexpr std::size_t NUM_BISECTION_BITS = sizeof(BisectionID) * CHAR_BIT
bool getSide(std::uint8_t depth, BisectionID id) bool getSide(std::uint8_t depth, BisectionID id)
{ {
return id & (1UL << (NUM_BISECTION_BITS - 1 - depth)); return id & (1ULL << (NUM_BISECTION_BITS - 1 - depth));
} }
std::vector<std::uint32_t> getLargeCells(const std::size_t max_cell_size, std::vector<std::uint32_t> getLargeCells(const std::size_t max_cell_size,
@ -74,7 +74,7 @@ void partitionLevel(const std::vector<BisectionID> &node_to_bisection_id,
return lhs | node_to_bisection_id[rhs]; return lhs | node_to_bisection_id[rhs];
}); });
// masks all bit strictly higher then cell.depth // masks all bit strictly higher then cell.depth
const BisectionID mask = (1UL << (NUM_BISECTION_BITS - cell.depth)) - 1; const BisectionID mask = (1ULL << (NUM_BISECTION_BITS - cell.depth)) - 1;
const auto masked_sum = sum & mask; const auto masked_sum = sum & mask;
// we can't split the cell anymore, but it also doesn't conform to the max size // we can't split the cell anymore, but it also doesn't conform to the max size
// constraint // constraint