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

Remove dead code

Browse Source
This commit is contained in:
Dennis Luxen 2013-08-13 18:35:54 +02:00
parent dc6fda03a1
commit 5f4f631fc5
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
DataStructures/QueryEdge.h
View File

@ -29,7 +29,11 @@ or see http://www.gnu.org/licenses/agpl.txt.
#include <climits> #include <climits>
struct OriginalEdgeData{ struct OriginalEdgeData{
explicit OriginalEdgeData(NodeID v, unsigned n, TurnInstruction t) : viaNode(v), nameID(n), turnInstruction(t) {} explicit OriginalEdgeData(
NodeID viaNode,
unsigned nameID,
TurnInstruction turnInstruction
) : viaNode(viaNode), nameID(nameID), turnInstruction(turnInstruction) {}
OriginalEdgeData() : viaNode(UINT_MAX), nameID(UINT_MAX), turnInstruction(UCHAR_MAX) {} OriginalEdgeData() : viaNode(UINT_MAX), nameID(UINT_MAX), turnInstruction(UCHAR_MAX) {}
NodeID viaNode; NodeID viaNode;
unsigned nameID; unsigned nameID;
@ -46,23 +50,12 @@ struct QueryEdge {
bool forward:1; bool forward:1;
bool backward:1; bool backward:1;
} data; } data;
bool operator<( const QueryEdge& right ) const {
if ( source != right.source )
return source < right.source;
return target < right.target;
}
//sorts by source and other attributes bool operator<( const QueryEdge& right ) const {
static bool CompareBySource( const QueryEdge& left, const QueryEdge& right ) { if ( source != right.source ) {
if ( left.source != right.source ) return source < right.source;
return left.source < right.source; }
int l = ( left.data.forward ? -1 : 0 ) + ( left.data.backward ? -1 : 0 ); return target < right.target;
int r = ( right.data.forward ? -1 : 0 ) + ( right.data.backward ? -1 : 0 );
if ( l != r )
return l < r;
if ( left.target != right.target )
return left.target < right.target;
return left.data.distance < right.data.distance;
} }
bool operator== ( const QueryEdge& right ) const { bool operator== ( const QueryEdge& right ) const {