niklas/rclcpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix type conversion warnings

Browse source
This commit is contained in:
Dirk Thomas 2015-07-27 17:47:51 -07:00
parent b1db8a8196
commit 4a21953c8e
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
rclcpp/include/rclcpp/executor.hpp
View file

@ -284,7 +284,7 @@ protected:
})); }));
} }
// Use the number of subscriptions to allocate memory in the handles // Use the number of subscriptions to allocate memory in the handles
unsigned long number_of_subscriptions = subs.size(); size_t number_of_subscriptions = subs.size();
rmw_subscriptions_t subscriber_handles; rmw_subscriptions_t subscriber_handles;
subscriber_handles.subscriber_count = number_of_subscriptions; subscriber_handles.subscriber_count = number_of_subscriptions;
// TODO(wjwwood): Avoid redundant malloc's // TODO(wjwwood): Avoid redundant malloc's
@ -303,7 +303,7 @@ protected:
} }
// Use the number of services to allocate memory in the handles // Use the number of services to allocate memory in the handles
unsigned long number_of_services = services.size(); size_t number_of_services = services.size();
rmw_services_t service_handles; rmw_services_t service_handles;
service_handles.service_count = number_of_services; service_handles.service_count = number_of_services;
service_handles.services = service_handles.services =
@ -321,7 +321,7 @@ protected:
} }
// Use the number of clients to allocate memory in the handles // Use the number of clients to allocate memory in the handles
unsigned long number_of_clients = clients.size(); size_t number_of_clients = clients.size();
rmw_clients_t client_handles; rmw_clients_t client_handles;
client_handles.client_count = number_of_clients; client_handles.client_count = number_of_clients;
client_handles.clients = client_handles.clients =
@ -341,8 +341,7 @@ protected:
// Use the number of guard conditions to allocate memory in the handles // Use the number of guard conditions to allocate memory in the handles
// Add 2 to the number for the ctrl-c guard cond and the executor's // Add 2 to the number for the ctrl-c guard cond and the executor's
size_t start_of_timer_guard_conds = 2; size_t start_of_timer_guard_conds = 2;
unsigned long number_of_guard_conds = size_t number_of_guard_conds = timers.size() + start_of_timer_guard_conds;
timers.size() + start_of_timer_guard_conds;
rmw_guard_conditions_t guard_condition_handles; rmw_guard_conditions_t guard_condition_handles;
guard_condition_handles.guard_condition_count = number_of_guard_conds; guard_condition_handles.guard_condition_count = number_of_guard_conds;
guard_condition_handles.guard_conditions = guard_condition_handles.guard_conditions =