Uncrustify 0.67 (#510)

* fix indentation to comply with uncrusity 0.67

* fix spacing before opening brackets

* space between reference and variable name in signature

* questionable space between pointer marker and variable name
This commit is contained in:
Mikael Arguedas 2018-07-11 08:31:11 -07:00 committed by GitHub
parent d36910d2d7
commit ae6f8e3e9a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 25 additions and 25 deletions

View file

@ -32,12 +32,12 @@ class AnyServiceCallback
{ {
private: private:
using SharedPtrCallback = std::function< using SharedPtrCallback = std::function<
void( void (
const std::shared_ptr<typename ServiceT::Request>, const std::shared_ptr<typename ServiceT::Request>,
std::shared_ptr<typename ServiceT::Response> std::shared_ptr<typename ServiceT::Response>
)>; )>;
using SharedPtrWithRequestHeaderCallback = std::function< using SharedPtrWithRequestHeaderCallback = std::function<
void( void (
const std::shared_ptr<rmw_request_id_t>, const std::shared_ptr<rmw_request_id_t>,
const std::shared_ptr<typename ServiceT::Request>, const std::shared_ptr<typename ServiceT::Request>,
std::shared_ptr<typename ServiceT::Response> std::shared_ptr<typename ServiceT::Response>

View file

@ -38,15 +38,15 @@ class AnySubscriptionCallback
using MessageDeleter = allocator::Deleter<MessageAlloc, MessageT>; using MessageDeleter = allocator::Deleter<MessageAlloc, MessageT>;
using MessageUniquePtr = std::unique_ptr<MessageT, MessageDeleter>; using MessageUniquePtr = std::unique_ptr<MessageT, MessageDeleter>;
using SharedPtrCallback = std::function<void(const std::shared_ptr<MessageT>)>; using SharedPtrCallback = std::function<void (const std::shared_ptr<MessageT>)>;
using SharedPtrWithInfoCallback = using SharedPtrWithInfoCallback =
std::function<void(const std::shared_ptr<MessageT>, const rmw_message_info_t &)>; std::function<void (const std::shared_ptr<MessageT>, const rmw_message_info_t &)>;
using ConstSharedPtrCallback = std::function<void(const std::shared_ptr<const MessageT>)>; using ConstSharedPtrCallback = std::function<void (const std::shared_ptr<const MessageT>)>;
using ConstSharedPtrWithInfoCallback = using ConstSharedPtrWithInfoCallback =
std::function<void(const std::shared_ptr<const MessageT>, const rmw_message_info_t &)>; std::function<void (const std::shared_ptr<const MessageT>, const rmw_message_info_t &)>;
using UniquePtrCallback = std::function<void(MessageUniquePtr)>; using UniquePtrCallback = std::function<void (MessageUniquePtr)>;
using UniquePtrWithInfoCallback = using UniquePtrWithInfoCallback =
std::function<void(MessageUniquePtr, const rmw_message_info_t &)>; std::function<void (MessageUniquePtr, const rmw_message_info_t &)>;
SharedPtrCallback shared_ptr_callback_; SharedPtrCallback shared_ptr_callback_;
SharedPtrWithInfoCallback shared_ptr_with_info_callback_; SharedPtrWithInfoCallback shared_ptr_with_info_callback_;

View file

@ -130,8 +130,8 @@ public:
using SharedFuture = std::shared_future<SharedResponse>; using SharedFuture = std::shared_future<SharedResponse>;
using SharedFutureWithRequest = std::shared_future<std::pair<SharedRequest, SharedResponse>>; using SharedFutureWithRequest = std::shared_future<std::pair<SharedRequest, SharedResponse>>;
using CallbackType = std::function<void(SharedFuture)>; using CallbackType = std::function<void (SharedFuture)>;
using CallbackWithRequestType = std::function<void(SharedFutureWithRequest)>; using CallbackWithRequestType = std::function<void (SharedFutureWithRequest)>;
RCLCPP_SMART_PTR_DEFINITIONS(Client) RCLCPP_SMART_PTR_DEFINITIONS(Client)

View file

@ -116,7 +116,7 @@ throw_from_rcl_error(
rcl_ret_t ret, rcl_ret_t ret,
const std::string & prefix = "", const std::string & prefix = "",
const rcl_error_state_t * error_state = nullptr, const rcl_error_state_t * error_state = nullptr,
void (*reset_error)() = rcl_reset_error); void (* reset_error)() = rcl_reset_error);
class RCLErrorBase class RCLErrorBase
{ {

View file

@ -130,20 +130,20 @@ struct function_traits<FunctionT &&>: function_traits<FunctionT>
*/ */
template<std::size_t Arity, typename FunctorT> template<std::size_t Arity, typename FunctorT>
struct arity_comparator : std::integral_constant< struct arity_comparator : std::integral_constant<
bool, (Arity == function_traits<FunctorT>::arity)>{}; bool, (Arity == function_traits<FunctorT>::arity)> {};
template<typename FunctorT, typename ... Args> template<typename FunctorT, typename ... Args>
struct check_arguments : std::is_same< struct check_arguments : std::is_same<
typename function_traits<FunctorT>::arguments, typename function_traits<FunctorT>::arguments,
std::tuple<Args ...> std::tuple<Args ...>
> >
{}; {};
template<typename FunctorAT, typename FunctorBT> template<typename FunctorAT, typename FunctorBT>
struct same_arguments : std::is_same< struct same_arguments : std::is_same<
typename function_traits<FunctorAT>::arguments, typename function_traits<FunctorAT>::arguments,
typename function_traits<FunctorBT>::arguments typename function_traits<FunctorBT>::arguments
> >
{}; {};
} // namespace function_traits } // namespace function_traits

View file

@ -326,7 +326,7 @@ public:
message_sequence_number, message_sequence_number,
requesting_subscriptions_intra_process_id, requesting_subscriptions_intra_process_id,
target_subs_size target_subs_size
); );
typename TypedMRB::SharedPtr typed_buffer = std::static_pointer_cast<TypedMRB>(buffer); typename TypedMRB::SharedPtr typed_buffer = std::static_pointer_cast<TypedMRB>(buffer);
if (!typed_buffer) { if (!typed_buffer) {
return; return;

View file

@ -89,12 +89,12 @@ class Service : public ServiceBase
{ {
public: public:
using CallbackType = std::function< using CallbackType = std::function<
void( void (
const std::shared_ptr<typename ServiceT::Request>, const std::shared_ptr<typename ServiceT::Request>,
std::shared_ptr<typename ServiceT::Response>)>; std::shared_ptr<typename ServiceT::Response>)>;
using CallbackWithHeaderType = std::function< using CallbackWithHeaderType = std::function<
void( void (
const std::shared_ptr<rmw_request_id_t>, const std::shared_ptr<rmw_request_id_t>,
const std::shared_ptr<typename ServiceT::Request>, const std::shared_ptr<typename ServiceT::Request>,
std::shared_ptr<typename ServiceT::Response>)>; std::shared_ptr<typename ServiceT::Response>)>;

View file

@ -266,8 +266,8 @@ public:
} }
using GetMessageCallbackType = using GetMessageCallbackType =
std::function<void(uint64_t, uint64_t, uint64_t, MessageUniquePtr &)>; std::function<void (uint64_t, uint64_t, uint64_t, MessageUniquePtr &)>;
using MatchesAnyPublishersCallbackType = std::function<bool(const rmw_gid_t *)>; using MatchesAnyPublishersCallbackType = std::function<bool (const rmw_gid_t *)>;
/// Implemenation detail. /// Implemenation detail.
void setup_intra_process( void setup_intra_process(

View file

@ -57,7 +57,7 @@ struct SubscriptionFactory
// Function that takes a MessageT from the intra process manager // Function that takes a MessageT from the intra process manager
using SetupIntraProcessFunction = std::function< using SetupIntraProcessFunction = std::function<
void( void (
rclcpp::intra_process_manager::IntraProcessManager::SharedPtr ipm, rclcpp::intra_process_manager::IntraProcessManager::SharedPtr ipm,
rclcpp::SubscriptionBase::SharedPtr subscription, rclcpp::SubscriptionBase::SharedPtr subscription,
const rcl_subscription_options_t & subscription_options)>; const rcl_subscription_options_t & subscription_options)>;

View file

@ -89,8 +89,8 @@ protected:
}; };
using VoidCallbackType = std::function<void()>; using VoidCallbackType = std::function<void ()>;
using TimerCallbackType = std::function<void(TimerBase &)>; using TimerCallbackType = std::function<void (TimerBase &)>;
/// Generic timer templated on the clock type. Periodically executes a user-specified callback. /// Generic timer templated on the clock type. Periodically executes a user-specified callback.
template< template<

View file

@ -44,7 +44,7 @@ throw_from_rcl_error(
rcl_ret_t ret, rcl_ret_t ret,
const std::string & prefix, const std::string & prefix,
const rcl_error_state_t * error_state, const rcl_error_state_t * error_state,
void (*reset_error)()) void (* reset_error)())
{ {
if (RCL_RET_OK == ret) { if (RCL_RET_OK == ret) {
throw std::invalid_argument("ret is RCL_RET_OK"); throw std::invalid_argument("ret is RCL_RET_OK");

View file

@ -628,7 +628,7 @@ rclcpp::executor::operator<<(std::ostream & os, const FutureReturnCode & future_
} }
std::string std::string
rclcpp::executor::to_string(const FutureReturnCode &future_return_code) rclcpp::executor::to_string(const FutureReturnCode & future_return_code)
{ {
using enum_type = std::underlying_type<FutureReturnCode>::type; using enum_type = std::underlying_type<FutureReturnCode>::type;
std::string prefix = "Unknown enum value ("; std::string prefix = "Unknown enum value (";

View file

@ -92,7 +92,7 @@ void TimeSource::attachNode(
node_topics_, node_topics_,
node_graph_, node_graph_,
node_services_ node_services_
); );
parameter_subscription_ = parameter_subscription_ =
parameter_client_->on_parameter_event(std::bind(&TimeSource::on_parameter_event, parameter_client_->on_parameter_event(std::bind(&TimeSource::on_parameter_event,
this, std::placeholders::_1)); this, std::placeholders::_1));