Merge pull request #154 from ros2/uncrustify_master

update style to match latest uncrustify

Author: dirk-thomas

rmw_fastrtps_cpp/include/rmw_fastrtps_cpp/TypeSupport.hpp

@@ -133,11 +133,12 @@ class TypeSupport : public eprosima::fastrtps::TopicDataType
   const MembersType * members_;
 
 private:
-  bool serializeROSmessage(eprosima::fastcdr::Cdr & ser, const MembersType * members,
-    const void * ros_message);
+  bool serializeROSmessage(
+    eprosima::fastcdr::Cdr & ser, const MembersType * members, const void * ros_message);
 
-  bool deserializeROSmessage(eprosima::fastcdr::Cdr & deser, const MembersType * members,
-    void * ros_message, bool call_new);
+  bool deserializeROSmessage(
+    eprosima::fastcdr::Cdr & deser, const MembersType * members, void * ros_message,
+    bool call_new);
 };
 
 }  // namespace rmw_fastrtps_cpp

rmw_fastrtps_cpp/include/rmw_fastrtps_cpp/TypeSupport_impl.hpp

@@ -901,7 +901,7 @@ std::function<uint32_t()> TypeSupport<MembersType>::getSerializedSizeProvider(vo
   assert(data);
 
   eprosima::fastcdr::Cdr * ser = static_cast<eprosima::fastcdr::Cdr *>(data);
-  return [ser]()->uint32_t {return static_cast<uint32_t>(ser->getSerializedDataLength()); };
+  return [ser]() -> uint32_t {return static_cast<uint32_t>(ser->getSerializedDataLength());};
 }
 
 }  // namespace rmw_fastrtps_cpp

rmw_fastrtps_cpp/src/demangle.cpp

@@ -64,9 +64,12 @@ _demangle_service_from_topic(const std::string & topic_name)
     ros_service_response_prefix,
     ros_service_requester_prefix,
   };
-  if (std::none_of(prefixes.cbegin(), prefixes.cend(), [&prefix](auto x) {
-    return prefix == x;
-  }))
+  if (
+    std::none_of(
+      prefixes.cbegin(), prefixes.cend(),
+      [&prefix](auto x) {
+        return prefix == x;
+      }))
   {
     // not a ROS service topic
     return "";

rmw_fastrtps_cpp/src/qos.cpp

@@ -78,8 +78,7 @@ get_datareader_qos(
   assert(sattr.topic.historyQos.depth >= 0);
   if (
     sattr.topic.historyQos.kind == eprosima::fastrtps::KEEP_LAST_HISTORY_QOS &&
-    static_cast<size_t>(sattr.topic.historyQos.depth) < qos_policies.depth
-  )
+    static_cast<size_t>(sattr.topic.historyQos.depth) < qos_policies.depth)
   {
     if (qos_policies.depth > (std::numeric_limits<int32_t>::max)()) {
       RMW_SET_ERROR_MSG(
@@ -146,8 +145,7 @@ get_datawriter_qos(
   assert(pattr.topic.historyQos.depth >= 0);
   if (
     pattr.topic.historyQos.kind == eprosima::fastrtps::KEEP_LAST_HISTORY_QOS &&
-    static_cast<size_t>(pattr.topic.historyQos.depth) < qos_policies.depth
-  )
+    static_cast<size_t>(pattr.topic.historyQos.depth) < qos_policies.depth)
   {
     if (qos_policies.depth > (std::numeric_limits<int32_t>::max)()) {
       RMW_SET_ERROR_MSG(

rmw_fastrtps_cpp/src/rmw_client.cpp

@@ -35,7 +35,8 @@
 extern "C"
 {
 rmw_client_t *
-rmw_create_client(const rmw_node_t * node,
+rmw_create_client(
+  const rmw_node_t * node,
   const rosidl_service_type_support_t * type_supports,
   const char * service_name, const rmw_qos_profile_t * qos_policies)
 {

rmw_fastrtps_cpp/src/rmw_publisher.cpp

@@ -29,7 +29,8 @@
 extern "C"
 {
 rmw_publisher_t *
-rmw_create_publisher(const rmw_node_t * node,
+rmw_create_publisher(
+  const rmw_node_t * node,
   const rosidl_message_type_support_t * type_supports,
   const char * topic_name, const rmw_qos_profile_t * qos_policies)
 {

rmw_fastrtps_cpp/src/rmw_request.cpp

@@ -31,7 +31,8 @@
 extern "C"
 {
 rmw_ret_t
-rmw_send_request(const rmw_client_t * client,
+rmw_send_request(
+  const rmw_client_t * client,
   const void * ros_request,
   int64_t * sequence_id)
 {
@@ -73,7 +74,8 @@ rmw_send_request(const rmw_client_t * client,
 }
 
 rmw_ret_t
-rmw_take_request(const rmw_service_t * service,
+rmw_take_request(
+  const rmw_service_t * service,
   rmw_request_id_t * request_header,
   void * ros_request,
   bool * taken)

rmw_fastrtps_cpp/src/rmw_response.cpp

@@ -29,7 +29,8 @@
 extern "C"
 {
 rmw_ret_t
-rmw_take_response(const rmw_client_t * client,
+rmw_take_response(
+  const rmw_client_t * client,
   rmw_request_id_t * request_header,
   void * ros_response,
   bool * taken)
@@ -67,7 +68,8 @@ rmw_take_response(const rmw_client_t * client,
 }
 
 rmw_ret_t
-rmw_send_response(const rmw_service_t * service,
+rmw_send_response(
+  const rmw_service_t * service,
   rmw_request_id_t * request_header,
   void * ros_response)
 {

rmw_fastrtps_cpp/src/rmw_service.cpp

@@ -45,7 +45,8 @@
 extern "C"
 {
 rmw_service_t *
-rmw_create_service(const rmw_node_t * node,
+rmw_create_service(
+  const rmw_node_t * node,
   const rosidl_service_type_support_t * type_supports,
   const char * service_name, const rmw_qos_profile_t * qos_policies)
 {

rmw_fastrtps_cpp/src/rmw_subscription.cpp

@@ -33,7 +33,8 @@
 extern "C"
 {
 rmw_subscription_t *
-rmw_create_subscription(const rmw_node_t * node,
+rmw_create_subscription(
+  const rmw_node_t * node,
   const rosidl_message_type_support_t * type_supports,
   const char * topic_name, const rmw_qos_profile_t * qos_policies, bool ignore_local_publications)
 {