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

fix style

Browse source
This commit is contained in:
Dirk Thomas 2015-05-26 10:52:38 -07:00
parent 6bfffaf94a
commit ef30f04215
4 changed files with 24 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -149,9 +149,8 @@ protected:
if (taken) { if (taken) {
subscription->handle_message(message); subscription->handle_message(message);
} else { } else {
std::cout << "[rclcpp::error] take failed for subscription on topic: " std::cout << "[rclcpp::error] take failed for subscription on topic: " <<
<< subscription->get_topic_name() subscription->get_topic_name() << std::endl;
<< std::endl;
} }
} }
@ -177,9 +176,8 @@ protected:
if (taken) { if (taken) {
service->handle_request(request_header, request); service->handle_request(request_header, request);
} else { } else {
std::cout << "[rclcpp::error] take failed for service on service: " std::cout << "[rclcpp::error] take failed for service on service: " <<
<< service->get_service_name() service->get_service_name() << std::endl;
<< std::endl;
} }
} }

2
rclcpp/include/rclcpp/macros.hpp
View file

@ -30,7 +30,7 @@
*/ */
#define RCLCPP_MAKE_SHARED_DEFINITIONS(Class) \ #define RCLCPP_MAKE_SHARED_DEFINITIONS(Class) \
typedef std::shared_ptr<Class> SharedPtr; \ typedef std::shared_ptr<Class> SharedPtr; \
\ \
template<typename ... Args> \ template<typename ... Args> \
static std::shared_ptr<Class> \ static std::shared_ptr<Class> \
make_shared(Args && ... args) \ make_shared(Args && ... args) \

28
rclcpp/include/rclcpp/node.hpp
View file

@ -195,20 +195,20 @@ private:
typename FunctorT, typename FunctorT,
typename std::enable_if< typename std::enable_if<
function_traits<FunctorT>::arity == 2 function_traits<FunctorT>::arity == 2
>::type * = nullptr, >::type * = nullptr,
typename std::enable_if< typename std::enable_if<
std::is_same< std::is_same<
typename function_traits<FunctorT>::template argument_type<0>, typename function_traits<FunctorT>::template argument_type<0>,
typename std::shared_ptr<typename ServiceT::Request> typename std::shared_ptr<typename ServiceT::Request>
>::value >::value
>::type * = nullptr, >::type * = nullptr,
typename std::enable_if< typename std::enable_if<
std::is_same< std::is_same<
typename function_traits<FunctorT>::template argument_type<1>, typename function_traits<FunctorT>::template argument_type<1>,
typename std::shared_ptr<typename ServiceT::Response> typename std::shared_ptr<typename ServiceT::Response>
>::value >::value
>::type * = nullptr >::type * = nullptr
> >
typename rclcpp::service::Service<ServiceT>::SharedPtr typename rclcpp::service::Service<ServiceT>::SharedPtr
create_service_internal( create_service_internal(
rmw_service_t * service_handle, rmw_service_t * service_handle,
@ -226,26 +226,26 @@ private:
typename FunctorT, typename FunctorT,
typename std::enable_if< typename std::enable_if<
function_traits<FunctorT>::arity == 3 function_traits<FunctorT>::arity == 3
>::type * = nullptr, >::type * = nullptr,
typename std::enable_if< typename std::enable_if<
std::is_same< std::is_same<
typename function_traits<FunctorT>::template argument_type<0>, typename function_traits<FunctorT>::template argument_type<0>,
std::shared_ptr<rmw_request_id_t> std::shared_ptr<rmw_request_id_t>
>::value >::value
>::type * = nullptr, >::type * = nullptr,
typename std::enable_if< typename std::enable_if<
std::is_same< std::is_same<
typename function_traits<FunctorT>::template argument_type<1>, typename function_traits<FunctorT>::template argument_type<1>,
typename std::shared_ptr<typename ServiceT::Request> typename std::shared_ptr<typename ServiceT::Request>
>::value >::value
>::type * = nullptr, >::type * = nullptr,
typename std::enable_if< typename std::enable_if<
std::is_same< std::is_same<
typename function_traits<FunctorT>::template argument_type<2>, typename function_traits<FunctorT>::template argument_type<2>,
typename std::shared_ptr<typename ServiceT::Response> typename std::shared_ptr<typename ServiceT::Response>
>::value >::value
>::type * = nullptr >::type * = nullptr
> >
typename rclcpp::service::Service<ServiceT>::SharedPtr typename rclcpp::service::Service<ServiceT>::SharedPtr
create_service_internal( create_service_internal(
rmw_service_t * service_handle, rmw_service_t * service_handle,

10
rclcpp/include/rclcpp/parameter_client.hpp
View file

@ -99,7 +99,7 @@ public:
callback(future_result); callback(future_result);
} }
} }
); );
return future_result; return future_result;
} }
@ -129,7 +129,7 @@ public:
callback(future_result); callback(future_result);
} }
} }
); );
return future_result; return future_result;
} }
@ -158,7 +158,7 @@ public:
callback(future_result); callback(future_result);
} }
} }
); );
return future_result; return future_result;
} }
@ -187,7 +187,7 @@ public:
callback(future_result); callback(future_result);
} }
} }
); );
return future_result; return future_result;
} }
@ -215,7 +215,7 @@ public:
callback(future_result); callback(future_result);
} }
} }
); );
return future_result; return future_result;
} }