Skip to content

Commit

Permalink
uncrustify
Browse files Browse the repository at this point in the history
  • Loading branch information
sloretz committed Dec 5, 2018
1 parent 4262135 commit 70ccd21
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions rclcpp_action/include/rclcpp_action/server.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ class Server : public ServerBase, public std::enable_shared_from_this<Server<ACT

/// Signature of a callback that accepts or rejects goal requests.
using GoalCallback = std::function<GoalResponse(
const GoalID&, std::shared_ptr<const typename ACTION::Goal>)>;
const GoalID &, std::shared_ptr<const typename ACTION::Goal>)>;
/// Signature of a callback that accepts or rejects requests to cancel a goal.
using CancelCallback = std::function<CancelResponse(std::shared_ptr<ServerGoalHandle<ACTION>>)>;
/// Signature of a callback that is used to notify when the goal has been accepted.
Expand Down Expand Up @@ -395,7 +395,7 @@ class Server : public ServerBase, public std::enable_shared_from_this<Server<ACT
std::shared_ptr<ServerGoalHandle<ACTION>> goal_handle;
std::weak_ptr<Server<ACTION>> weak_this = this->shared_from_this();

std::function<void(const GoalID&, std::shared_ptr<void>)> on_terminal_state =
std::function<void(const GoalID &, std::shared_ptr<void>)> on_terminal_state =
[weak_this](const GoalID & uuid, std::shared_ptr<void> result_message)
{
std::shared_ptr<Server<ACTION>> shared_this = weak_this.lock();
Expand All @@ -413,7 +413,7 @@ class Server : public ServerBase, public std::enable_shared_from_this<Server<ACT
shared_this->goal_handles_.erase(uuid);
};

std::function<void(const GoalID&)> on_executing =
std::function<void(const GoalID &)> on_executing =
[weak_this](const GoalID & uuid)
{
std::shared_ptr<Server<ACTION>> shared_this = weak_this.lock();
Expand Down
8 changes: 4 additions & 4 deletions rclcpp_action/include/rclcpp_action/server_goal_handle.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,8 @@ class ServerGoalHandle : public ServerGoalHandleBase
std::shared_ptr<rcl_action_goal_handle_t> rcl_handle,
GoalID uuid,
std::shared_ptr<const typename ACTION::Goal> goal,
std::function<void(const GoalID&, std::shared_ptr<void>)> on_terminal_state,
std::function<void(const GoalID&)> on_executing,
std::function<void(const GoalID &, std::shared_ptr<void>)> on_terminal_state,
std::function<void(const GoalID &)> on_executing,
std::function<void(std::shared_ptr<typename ACTION::Feedback>)> publish_feedback
)
: ServerGoalHandleBase(rcl_handle), goal_(goal), uuid_(uuid),
Expand All @@ -249,8 +249,8 @@ class ServerGoalHandle : public ServerGoalHandleBase

friend Server<ACTION>;

std::function<void(const GoalID&, std::shared_ptr<void>)> on_terminal_state_;
std::function<void(const GoalID&)> on_executing_;
std::function<void(const GoalID &, std::shared_ptr<void>)> on_terminal_state_;
std::function<void(const GoalID &)> on_executing_;
std::function<void(std::shared_ptr<typename ACTION::Feedback>)> publish_feedback_;
};
} // namespace rclcpp_action
Expand Down

0 comments on commit 70ccd21

Please sign in to comment.