diff options
author | Stefan Wildemann <metalstrolch@users.noreply.github.com> | 2019-11-05 12:14:01 +0100 |
---|---|---|
committer | jkoan <jkoan@users.noreply.github.com> | 2019-11-05 12:14:01 +0100 |
commit | fbe6d4cf832a9af1846a75834c8a392eee984cb7 (patch) | |
tree | 96164622a1847c3d4c02c450f0fd6c2cbf0ed534 /navit/vehicleprofile.h | |
parent | 39f745bc282c45443deef8e13b381f207207da58 (diff) | |
download | navit-fbe6d4cf832a9af1846a75834c8a392eee984cb7.tar.gz |
fix:various:fix compiler warnings (#940)
* fix:core:build without warnings
on my setup navit_core build without non avoidable warnings.
* fix:dbus:fix compiler warnings
* fix:gui/internal: remov compiler warnings
* fix:various:remove compiler warnings
* fix:various remove compiler warnings.
* fix:various: fix android compiler warnings
Diffstat (limited to 'navit/vehicleprofile.h')
-rw-r--r-- | navit/vehicleprofile.h | 53 |
1 files changed, 27 insertions, 26 deletions
diff --git a/navit/vehicleprofile.h b/navit/vehicleprofile.h index 4e1b6a340..58ffa1489 100644 --- a/navit/vehicleprofile.h +++ b/navit/vehicleprofile.h @@ -24,40 +24,41 @@ extern "C" { enum maxspeed_handling { - maxspeed_enforce = 0, /*!< Always enforce maxspeed of segment */ - maxspeed_restrict = 1, /*!< Enforce maxspeed of segment only if it restricts the speed */ - maxspeed_ignore = 2, /*!< Ignore maxspeed of segment, always use {@code route_weight} of road profile */ + maxspeed_enforce = 0, /*!< Always enforce maxspeed of segment */ + maxspeed_restrict = 1, /*!< Enforce maxspeed of segment only if it restricts the speed */ + maxspeed_ignore = 2, /*!< Ignore maxspeed of segment, always use {@code route_weight} of road profile */ }; struct vehicleprofile { - NAVIT_OBJECT - int mode; /**< 0 = Auto, 1 = On-Road, 2 = Off-Road */ - int flags_forward_mask; /**< Flags mask for moving in positive direction */ - int flags_reverse_mask; /**< Flags mask for moving in reverse direction */ - int flags; /**< Required flags to move through a segment */ - int maxspeed_handling; /**< How to handle maxspeed of segment, see {@code enum maxspeed_handling} */ - int static_speed; /**< Maximum speed of vehicle to consider it stationary */ - int static_distance; /**< Maximum distance of previous position of vehicle to consider it stationary */ - char *name; /**< the vehicle profile name */ - char *route_depth; /**< the route depth attribute */ - int width; /**< Width of the vehicle in cm */ - int height; /**< Height of the vehicle in cm */ - int length; /**< Length of the vehicle in cm */ - int weight; /**< Weight of the vehicle in kg */ - int axle_weight; /**< Axle Weight of the vehicle in kg */ - int dangerous_goods; /**< Flags of dangerous goods present */ - int through_traffic_penalty; /**< Penalty when driving on a through traffic limited road */ - GHashTable *roadprofile_hash; - struct attr active_callback; - int turn_around_penalty; /**< Penalty when turning around */ - int turn_around_penalty2; /**< Penalty when turning around, for planned turn arounds */ + NAVIT_OBJECT + int mode; /**< 0 = Auto, 1 = On-Road, 2 = Off-Road */ + int flags_forward_mask; /**< Flags mask for moving in positive direction */ + int flags_reverse_mask; /**< Flags mask for moving in reverse direction */ + int flags; /**< Required flags to move through a segment */ + int maxspeed_handling; /**< How to handle maxspeed of segment, see {@code enum maxspeed_handling} */ + int static_speed; /**< Maximum speed of vehicle to consider it stationary */ + int static_distance; /**< Maximum distance of previous position of vehicle to consider it stationary */ + char *name; /**< the vehicle profile name */ + char *route_depth; /**< the route depth attribute */ + int width; /**< Width of the vehicle in cm */ + int height; /**< Height of the vehicle in cm */ + int length; /**< Length of the vehicle in cm */ + int weight; /**< Weight of the vehicle in kg */ + int axle_weight; /**< Axle Weight of the vehicle in kg */ + int dangerous_goods; /**< Flags of dangerous goods present */ + int through_traffic_penalty; /**< Penalty when driving on a through traffic limited road */ + GHashTable *roadprofile_hash; + struct attr active_callback; + int turn_around_penalty; /**< Penalty when turning around */ + int turn_around_penalty2; /**< Penalty when turning around, for planned turn arounds */ }; struct vehicleprofile * vehicleprofile_new(struct attr *parent, struct attr **attrs); -struct attr_iter *vehicleprofile_attr_iter_new(void); +struct attr_iter *vehicleprofile_attr_iter_new(void * unused); void vehicleprofile_attr_iter_destroy(struct attr_iter *iter); -int vehicleprofile_get_attr(struct vehicleprofile *this_, enum attr_type type, struct attr *attr, struct attr_iter *iter); +int vehicleprofile_get_attr(struct vehicleprofile *this_, enum attr_type type, struct attr *attr, + struct attr_iter *iter); int vehicleprofile_set_attr(struct vehicleprofile *this_, struct attr *attr); int vehicleprofile_add_attr(struct vehicleprofile *this_, struct attr *attr); int vehicleprofile_remove_attr(struct vehicleprofile *this_, struct attr *attr); |