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

[windows] use unsigned long to fix warning

Browse source
This commit is contained in:
William Woodall 2015-03-11 22:41:10 -07:00 • committed by William Woodall
parent cadc8e76e1
commit 2a9b82bfba
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -270,7 +270,7 @@ protected:
})); }));
} }
// Use the number of subscriptions to allocate memory in the handles // Use the number of subscriptions to allocate memory in the handles
size_t number_of_subscriptions = subs.size(); unsigned long 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
@ -291,7 +291,7 @@ protected:
} }
// Use the number of services to allocate memory in the handles // Use the number of services to allocate memory in the handles
size_t number_of_services = services.size(); unsigned long 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;
// TODO(esteve): Avoid redundant malloc's // TODO(esteve): Avoid redundant malloc's
@ -312,7 +312,7 @@ protected:
} }
// Use the number of clients to allocate memory in the handles // Use the number of clients to allocate memory in the handles
size_t number_of_clients = clients.size(); unsigned long 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;
// TODO: Avoid redundant malloc's // TODO: Avoid redundant malloc's
@ -335,7 +335,8 @@ 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;
size_t number_of_guard_conds = timers.size() + start_of_timer_guard_conds; unsigned long number_of_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;
// TODO(wjwwood): Avoid redundant malloc's // TODO(wjwwood): Avoid redundant malloc's