From 5a1ff4b50deb09e3c51f2b515df88803f9aed9bb Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Tue, 10 Feb 2015 11:09:51 +0100 Subject: [PATCH] fix warning: implicit conversion changes signedness: 'int' to 'unsigned int' --- data_structures/phantom_node.cpp | 105 ++++++++++++------------------- 1 file changed, 40 insertions(+), 65 deletions(-) diff --git a/data_structures/phantom_node.cpp b/data_structures/phantom_node.cpp index 5351a4dfb..9a0988564 100644 --- a/data_structures/phantom_node.cpp +++ b/data_structures/phantom_node.cpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2013, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM, Dennis Luxen, others All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -34,40 +34,37 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include -PhantomNode::PhantomNode(NodeID forward_node_id, NodeID reverse_node_id, unsigned name_id, - int forward_weight, int reverse_weight, int forward_offset, int reverse_offset, - unsigned packed_geometry_id, unsigned component_id, FixedPointCoordinate &location, - unsigned short fwd_segment_position, - TravelMode forward_travel_mode, TravelMode backward_travel_mode) : - forward_node_id(forward_node_id), - reverse_node_id(reverse_node_id), - name_id(name_id), - forward_weight(forward_weight), - reverse_weight(reverse_weight), - forward_offset(forward_offset), - reverse_offset(reverse_offset), - packed_geometry_id(packed_geometry_id), - component_id(component_id), - location(location), - fwd_segment_position(fwd_segment_position), - forward_travel_mode(forward_travel_mode), - backward_travel_mode(backward_travel_mode) -{ } +PhantomNode::PhantomNode(NodeID forward_node_id, + NodeID reverse_node_id, + unsigned name_id, + int forward_weight, + int reverse_weight, + int forward_offset, + int reverse_offset, + unsigned packed_geometry_id, + unsigned component_id, + FixedPointCoordinate &location, + unsigned short fwd_segment_position, + TravelMode forward_travel_mode, + TravelMode backward_travel_mode) + : forward_node_id(forward_node_id), reverse_node_id(reverse_node_id), name_id(name_id), + forward_weight(forward_weight), reverse_weight(reverse_weight), + forward_offset(forward_offset), reverse_offset(reverse_offset), + packed_geometry_id(packed_geometry_id), component_id(component_id), location(location), + fwd_segment_position(fwd_segment_position), forward_travel_mode(forward_travel_mode), + backward_travel_mode(backward_travel_mode) +{ +} -PhantomNode::PhantomNode() : - forward_node_id(SPECIAL_NODEID), - reverse_node_id(SPECIAL_NODEID), - name_id(std::numeric_limits::max()), - forward_weight(INVALID_EDGE_WEIGHT), - reverse_weight(INVALID_EDGE_WEIGHT), - forward_offset(0), - reverse_offset(0), - packed_geometry_id(SPECIAL_EDGEID), - component_id(-1), - fwd_segment_position(0), - forward_travel_mode(TRAVEL_MODE_INACCESSIBLE), - backward_travel_mode(TRAVEL_MODE_INACCESSIBLE) -{ } +PhantomNode::PhantomNode() + : forward_node_id(SPECIAL_NODEID), reverse_node_id(SPECIAL_NODEID), + name_id(std::numeric_limits::max()), forward_weight(INVALID_EDGE_WEIGHT), + reverse_weight(INVALID_EDGE_WEIGHT), forward_offset(0), reverse_offset(0), + packed_geometry_id(SPECIAL_EDGEID), component_id(std::numeric_limits::max()), + fwd_segment_position(0), forward_travel_mode(TRAVEL_MODE_INACCESSIBLE), + backward_travel_mode(TRAVEL_MODE_INACCESSIBLE) +{ +} int PhantomNode::GetForwardWeightPlusOffset() const { @@ -89,43 +86,21 @@ int PhantomNode::GetReverseWeightPlusOffset() const bool PhantomNode::is_bidirected() const { - return (forward_node_id != SPECIAL_NODEID) && - (reverse_node_id != SPECIAL_NODEID); + return (forward_node_id != SPECIAL_NODEID) && (reverse_node_id != SPECIAL_NODEID); } -bool PhantomNode::is_compressed() const -{ - return (forward_offset != 0) || (reverse_offset != 0); -} +bool PhantomNode::is_compressed() const { return (forward_offset != 0) || (reverse_offset != 0); } bool PhantomNode::is_valid(const unsigned number_of_nodes) const -{ - return - location.is_valid() && - ( - (forward_node_id < number_of_nodes) || - (reverse_node_id < number_of_nodes) - ) && - ( - (forward_weight != INVALID_EDGE_WEIGHT) || - (reverse_weight != INVALID_EDGE_WEIGHT) - ) && - (name_id != INVALID_NAMEID - ); -} - -bool PhantomNode::is_in_tiny_component() const -{ - return component_id != 0; -} - -bool PhantomNode::is_valid() const { return location.is_valid() && + ((forward_node_id < number_of_nodes) || (reverse_node_id < number_of_nodes)) && + ((forward_weight != INVALID_EDGE_WEIGHT) || (reverse_weight != INVALID_EDGE_WEIGHT)) && (name_id != INVALID_NAMEID); } -bool PhantomNode::operator==(const PhantomNode & other) const -{ - return location == other.location; -} +bool PhantomNode::is_in_tiny_component() const { return component_id != 0; } + +bool PhantomNode::is_valid() const { return location.is_valid() && (name_id != INVALID_NAMEID); } + +bool PhantomNode::operator==(const PhantomNode &other) const { return location == other.location; }