avoid signed/unsigned comparison

This commit is contained in:
Dennis Luxen 2014-06-10 18:08:58 +02:00
parent 3127fafc88
commit 71c4f81b59

View File

@ -51,19 +51,19 @@ template <class DataFacadeT> class JSONDescriptor : public BaseDescriptor<DataFa
unsigned entered_restricted_area_count; unsigned entered_restricted_area_count;
struct RoundAbout struct RoundAbout
{ {
RoundAbout() : start_index(INT_MAX), name_id(INT_MAX), leave_at_exit(INT_MAX) {} RoundAbout() : start_index(INT_MAX), name_id(INVALID_NAMEID), leave_at_exit(INT_MAX) {}
int start_index; int start_index;
int name_id; unsigned name_id;
int leave_at_exit; int leave_at_exit;
} round_about; } round_about;
struct Segment struct Segment
{ {
Segment() : name_id(-1), length(-1), position(-1) {} Segment() : name_id(INVALID_NAMEID), length(-1), position(0) {}
Segment(int n, int l, int p) : name_id(n), length(l), position(p) {} Segment(unsigned n, int l, unsigned p) : name_id(n), length(l), position(p) {}
int name_id; unsigned name_id;
int length; int length;
int position; unsigned position;
}; };
std::vector<Segment> shortest_path_segments, alternative_path_segments; std::vector<Segment> shortest_path_segments, alternative_path_segments;
ExtractRouteNames<DataFacadeT, Segment> GenerateRouteNames; ExtractRouteNames<DataFacadeT, Segment> GenerateRouteNames;