Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rename rmw_listener_cb_t->rmw_listener_callback_t #41

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rclcpp/include/rclcpp/client.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ class ClientBase
void
set_events_executor_callback(
const rclcpp::executors::EventsExecutor * executor,
rmw_listener_cb_t executor_callback) const;
rmw_listener_callback_t executor_callback) const;

protected:
RCLCPP_DISABLE_COPY(ClientBase)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class EventsExecutorNotifyWaitable final : public EventWaitable
void
set_events_executor_callback(
const rclcpp::executors::EventsExecutor * executor,
rmw_listener_cb_t executor_callback) const override
rmw_listener_callback_t executor_callback) const override
{
for (auto gc : notify_guard_conditions_) {
rcl_ret_t ret = rcl_guard_condition_set_listener_callback(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ class SubscriptionIntraProcessBase : public rclcpp::Waitable
void
set_events_executor_callback(
const rclcpp::executors::EventsExecutor * executor,
rmw_listener_cb_t executor_callback) const override;
rmw_listener_callback_t executor_callback) const override;

protected:
std::recursive_mutex reentrant_mutex_;
Expand Down
2 changes: 1 addition & 1 deletion rclcpp/include/rclcpp/qos_event.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ class QOSEventHandlerBase : public Waitable
void
set_events_executor_callback(
const rclcpp::executors::EventsExecutor * executor,
rmw_listener_cb_t executor_callback) const override;
rmw_listener_callback_t executor_callback) const override;

protected:
rcl_event_t event_handle_;
Expand Down
2 changes: 1 addition & 1 deletion rclcpp/include/rclcpp/service.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ class ServiceBase
void
set_events_executor_callback(
const rclcpp::executors::EventsExecutor * executor,
rmw_listener_cb_t executor_callback) const;
rmw_listener_callback_t executor_callback) const;

protected:
RCLCPP_DISABLE_COPY(ServiceBase)
Expand Down
2 changes: 1 addition & 1 deletion rclcpp/include/rclcpp/subscription_base.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ class SubscriptionBase : public std::enable_shared_from_this<SubscriptionBase>
void
set_events_executor_callback(
const rclcpp::executors::EventsExecutor * executor,
rmw_listener_cb_t executor_callback) const;
rmw_listener_callback_t executor_callback) const;

protected:
template<typename EventCallbackT>
Expand Down
2 changes: 1 addition & 1 deletion rclcpp/include/rclcpp/waitable.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ class Waitable
void
set_events_executor_callback(
const rclcpp::executors::EventsExecutor * executor,
rmw_listener_cb_t executor_callback) const;
rmw_listener_callback_t executor_callback) const;

private:
std::atomic<bool> in_use_by_wait_set_{false};
Expand Down
2 changes: 1 addition & 1 deletion rclcpp/src/rclcpp/client.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ ClientBase::exchange_in_use_by_wait_set_state(bool in_use_state)
void
ClientBase::set_events_executor_callback(
const rclcpp::executors::EventsExecutor * executor,
rmw_listener_cb_t executor_callback) const
rmw_listener_callback_t executor_callback) const
{
rcl_ret_t ret = rcl_client_set_listener_callback(
client_handle_.get(),
Expand Down
2 changes: 1 addition & 1 deletion rclcpp/src/rclcpp/qos_event.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ QOSEventHandlerBase::is_ready(rcl_wait_set_t * wait_set)
void
QOSEventHandlerBase::set_events_executor_callback(
const rclcpp::executors::EventsExecutor * executor,
rmw_listener_cb_t executor_callback) const
rmw_listener_callback_t executor_callback) const
{
rcl_ret_t ret = rcl_event_set_listener_callback(
&event_handle_,
Expand Down
2 changes: 1 addition & 1 deletion rclcpp/src/rclcpp/service.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ ServiceBase::exchange_in_use_by_wait_set_state(bool in_use_state)
void
ServiceBase::set_events_executor_callback(
const rclcpp::executors::EventsExecutor * executor,
rmw_listener_cb_t executor_callback) const
rmw_listener_callback_t executor_callback) const
{
rcl_ret_t ret = rcl_service_set_listener_callback(
service_handle_.get(),
Expand Down
2 changes: 1 addition & 1 deletion rclcpp/src/rclcpp/subscription_base.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ SubscriptionBase::exchange_in_use_by_wait_set_state(
void
SubscriptionBase::set_events_executor_callback(
const rclcpp::executors::EventsExecutor * executor,
rmw_listener_cb_t executor_callback) const
rmw_listener_callback_t executor_callback) const
{
rcl_ret_t ret = rcl_subscription_set_listener_callback(
subscription_handle_.get(),
Expand Down
2 changes: 1 addition & 1 deletion rclcpp/src/rclcpp/subscription_intra_process_base.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ SubscriptionIntraProcessBase::get_actual_qos() const
void
SubscriptionIntraProcessBase::set_events_executor_callback(
const rclcpp::executors::EventsExecutor * executor,
rmw_listener_cb_t executor_callback) const
rmw_listener_callback_t executor_callback) const
{
rcl_ret_t ret = rcl_guard_condition_set_listener_callback(
&gc_,
Expand Down
2 changes: 1 addition & 1 deletion rclcpp/src/rclcpp/waitable.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Waitable::exchange_in_use_by_wait_set_state(bool in_use_state)
void
Waitable::set_events_executor_callback(
const rclcpp::executors::EventsExecutor * executor,
rmw_listener_cb_t executor_callback) const
rmw_listener_callback_t executor_callback) const
{
(void)executor;
(void)executor_callback;
Expand Down
2 changes: 1 addition & 1 deletion rclcpp/test/rclcpp/executors/test_executors.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ class TestWaitable : public rclcpp::Waitable
void
set_events_executor_callback(
const rclcpp::executors::EventsExecutor * executor,
rmw_listener_cb_t executor_callback) const override
rmw_listener_callback_t executor_callback) const override
{
rcl_ret_t ret = rcl_guard_condition_set_listener_callback(
&gc_,
Expand Down