update style to match latest uncrustify

This commit is contained in:
Dirk Thomas 2017-09-28 11:57:18 -07:00
parent e1f4568bc7
commit 38c750b876
28 changed files with 151 additions and 100 deletions

View file

@ -25,8 +25,10 @@ struct has_on_activate
};
template<class T>
struct has_on_activate<T, typename std::enable_if<
std::is_same<void, decltype(std::declval<T>().on_activate())>::value>::type>
struct has_on_activate<
T,
typename std::enable_if<
std::is_same<void, decltype(std::declval<T>().on_activate())>::value>::type>
{
static constexpr bool value = true;
};
@ -38,8 +40,10 @@ struct has_on_deactivate
};
template<class T>
struct has_on_deactivate<T, typename std::enable_if<
std::is_same<void, decltype(std::declval<T>().on_deactivate())>::value>::type>
struct has_on_deactivate<
T,
typename std::enable_if<
std::is_same<void, decltype(std::declval<T>().on_deactivate())>::value>::type>
{
static constexpr bool value = true;
};
@ -49,8 +53,10 @@ struct is_manageable_node : std::false_type
{};
template<class T>
struct is_manageable_node<T, typename std::enable_if<
has_on_activate<T>::value && has_on_deactivate<T>::value>::type>: std::true_type
struct is_manageable_node<
T,
typename std::enable_if<
has_on_activate<T>::value && has_on_deactivate<T>::value>::type>: std::true_type
{};
#endif // RCLCPP_LIFECYCLE__TYPE_TRAITS__IS_MANAGEABLE_NODE_HPP_

View file

@ -135,7 +135,8 @@ LifecycleNode::get_parameter(const std::string & name) const
return node_parameters_->get_parameter(name);
}
bool LifecycleNode::get_parameter(const std::string & name,
bool LifecycleNode::get_parameter(
const std::string & name,
rclcpp::parameter::ParameterVariant & parameter) const
{
return node_parameters_->get_parameter(name, parameter);

View file

@ -164,7 +164,8 @@ public:
}
bool
register_callback(std::uint8_t lifecycle_transition, std::function<rcl_lifecycle_transition_key_t(
register_callback(
std::uint8_t lifecycle_transition, std::function<rcl_lifecycle_transition_key_t(
const State &)> & cb)
{
cb_map_[lifecycle_transition] = cb;
@ -172,7 +173,8 @@ public:
}
void
on_change_state(const std::shared_ptr<rmw_request_id_t> header,
on_change_state(
const std::shared_ptr<rmw_request_id_t> header,
const std::shared_ptr<ChangeStateSrv::Request> req,
std::shared_ptr<ChangeStateSrv::Response> resp)
{
@ -192,7 +194,8 @@ public:
}
void
on_get_state(const std::shared_ptr<rmw_request_id_t> header,
on_get_state(
const std::shared_ptr<rmw_request_id_t> header,
const std::shared_ptr<GetStateSrv::Request> req,
std::shared_ptr<GetStateSrv::Response> resp)
{
@ -207,7 +210,8 @@ public:
}
void
on_get_available_states(const std::shared_ptr<rmw_request_id_t> header,
on_get_available_states(
const std::shared_ptr<rmw_request_id_t> header,
const std::shared_ptr<GetAvailableStatesSrv::Request> req,
std::shared_ptr<GetAvailableStatesSrv::Response> resp)
{
@ -226,7 +230,8 @@ public:
}
void
on_get_available_transitions(const std::shared_ptr<rmw_request_id_t> header,
on_get_available_transitions(
const std::shared_ptr<rmw_request_id_t> header,
const std::shared_ptr<GetAvailableTransitionsSrv::Request> req,
std::shared_ptr<GetAvailableTransitionsSrv::Response> resp)
{