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

Removing old style cast

Browse Source
This commit is contained in:
DennisOSRM 2012-09-19 11:25:51 +02:00
parent aeb701f52e
commit 5423cff7a8
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
DataStructures/BinaryHeap.h
View File

@ -117,14 +117,14 @@ public:
} }
Key Size() const { Key Size() const {
return ( Key )( heap.size() - 1 ); return static_cast<Key>( heap.size() - 1 );
} }
void Insert( NodeID node, Weight weight, const Data &data ) { void Insert( NodeID node, Weight weight, const Data &data ) {
HeapElement element; HeapElement element;
element.index = ( NodeID ) insertedNodes.size(); element.index = static_cast<NodeID>(insertedNodes.size());
element.weight = weight; element.weight = weight;
const Key key = ( Key ) heap.size(); const Key key = static_cast<Key>(heap.size());
heap.push_back( element ); heap.push_back( element );
insertedNodes.push_back( HeapNode( node, key, weight, data ) ); insertedNodes.push_back( HeapNode( node, key, weight, data ) );
nodeIndex[node] = element.index; nodeIndex[node] = element.index;
@ -150,7 +150,7 @@ public:
bool WasInserted( NodeID node ) { bool WasInserted( NodeID node ) {
const Key index = nodeIndex[node]; const Key index = nodeIndex[node];
if ( index >= ( Key ) insertedNodes.size() ) if ( index >= static_cast<Key> (insertedNodes.size()) )
return false; return false;
return insertedNodes[index].node == node; return insertedNodes[index].node == node;
} }
@ -218,9 +218,9 @@ private:
const Key droppingIndex = heap[key].index; const Key droppingIndex = heap[key].index;
const Weight weight = heap[key].weight; const Weight weight = heap[key].weight;
Key nextKey = key << 1; Key nextKey = key << 1;
while ( nextKey < ( Key ) heap.size() ) { while ( nextKey < static_cast<Key>( heap.size() ) ) {
const Key nextKeyOther = nextKey + 1; const Key nextKeyOther = nextKey + 1;
if ( ( nextKeyOther < ( Key ) heap.size() )&& ( heap[nextKey].weight > heap[nextKeyOther].weight) ) if ( ( nextKeyOther < static_cast<Key> ( heap.size() ) )&& ( heap[nextKey].weight > heap[nextKeyOther].weight) )
nextKey = nextKeyOther; nextKey = nextKeyOther;
if ( weight <= heap[nextKey].weight ) if ( weight <= heap[nextKey].weight )