Merge branch 'master' of https://github.com/ros2/rmw_fastrtps into sr…

…iram_beta3
ros2 · Oct 30, 2017 · 5030f85 · 5030f85
2 parents db2d734 + 4e22c3e
commit 5030f85
Show file tree

Hide file tree

Showing 29 changed files with 241 additions and 240 deletions.
diff --git a/rmw_fastrtps_cpp/include/rmw_fastrtps_cpp/TypeSupport_impl.hpp b/rmw_fastrtps_cpp/include/rmw_fastrtps_cpp/TypeSupport_impl.hpp
@@ -69,7 +69,7 @@ rosidl_generator_c__void__Array__init(
   if (!array) {
     return false;
   }
-  void * data = NULL;
+  void * data = nullptr;
   if (size) {
     data = static_cast<void *>(calloc(size, member_size));
     if (!data) {
@@ -94,7 +94,7 @@ rosidl_generator_c__void__Array__fini(rosidl_generator_c__void__Array * array)
     assert(array->capacity > 0);
     // finalize all array elements
     free(array->data);
-    array->data = NULL;
+    array->data = nullptr;
     array->size = 0;
     array->capacity = 0;
   } else {
@@ -186,7 +186,7 @@ static size_t calculateMaxAlign(const MembersType * members)
           break;
         case ::rosidl_typesupport_introspection_cpp::ROS_TYPE_MESSAGE:
           {
-            const MembersType * sub_members = (const MembersType *)member.members_->data;
+            auto sub_members = (const MembersType *)member.members_->data;
             alignment = calculateMaxAlign(sub_members);
           }
           break;
@@ -269,7 +269,7 @@ size_t get_array_size_and_assign_field(
   size_t sub_members_size,
   size_t max_align)
 {
-  std::vector<unsigned char> * vector = reinterpret_cast<std::vector<unsigned char> *>(field);
+  auto vector = reinterpret_cast<std::vector<unsigned char> *>(field);
   void * ptr = reinterpret_cast<void *>(sub_members_size);
   size_t vsize = vector->size() / reinterpret_cast<size_t>(align_(max_align, ptr));
   if (member->is_upper_bound_ && vsize > member->array_size_) {
@@ -286,8 +286,7 @@ size_t get_array_size_and_assign_field(
   void * & subros_message,
   size_t, size_t)
 {
-  rosidl_generator_c__void__Array * tmparray =
-    static_cast<rosidl_generator_c__void__Array *>(field);
+  auto tmparray = static_cast<rosidl_generator_c__void__Array *>(field);
   if (member->is_upper_bound_ && tmparray->size > member->array_size_) {
     throw std::runtime_error("vector overcomes the maximum length");
   }
@@ -362,7 +361,7 @@ bool TypeSupport<MembersType>::serializeROSmessage(
           break;
         case ::rosidl_typesupport_introspection_cpp::ROS_TYPE_MESSAGE:
           {
-            const MembersType * sub_members = (const MembersType *)member->members_->data;
+            auto sub_members = (const MembersType *)member->members_->data;
             serializeROSmessage(ser, sub_members, field);
           }
           break;
@@ -411,7 +410,7 @@ bool TypeSupport<MembersType>::serializeROSmessage(
           break;
         case ::rosidl_typesupport_introspection_cpp::ROS_TYPE_MESSAGE:
           {
-            const MembersType * sub_members =
+            auto sub_members =
               static_cast<const MembersType *>(member->members_->data);
             void * subros_message = nullptr;
             size_t array_size = 0;
@@ -455,7 +454,7 @@ void deserialize_array(
   if (member->array_size_ && !member->is_upper_bound_) {
     deser.deserializeArray(static_cast<T *>(field), member->array_size_);
   } else {
-    std::vector<T> & vector = *reinterpret_cast<std::vector<T> *>(field);
+    auto & vector = *reinterpret_cast<std::vector<T> *>(field);
     if (call_new) {
       new(&vector) std::vector<T>;
     }
@@ -533,7 +532,7 @@ inline size_t get_submessage_array_deserialize(
   uint32_t vsize = 0;
   // Deserialize length
   deser >> vsize;
-  std::vector<unsigned char> * vector = reinterpret_cast<std::vector<unsigned char> *>(field);
+  auto vector = reinterpret_cast<std::vector<unsigned char> *>(field);
   if (call_new) {
     new(vector) std::vector<unsigned char>;
   }
@@ -556,8 +555,7 @@ inline size_t get_submessage_array_deserialize(
   // Deserialize length
   uint32_t vsize = 0;
   deser >> vsize;
-  rosidl_generator_c__void__Array * tmparray =
-    static_cast<rosidl_generator_c__void__Array *>(field);
+  auto tmparray = static_cast<rosidl_generator_c__void__Array *>(field);
   rosidl_generator_c__void__Array__init(tmparray, vsize, sub_members_size);
   subros_message = reinterpret_cast<void *>(tmparray->data);
   return vsize;
@@ -618,7 +616,7 @@ bool TypeSupport<MembersType>::deserializeROSmessage(
           break;
         case ::rosidl_typesupport_introspection_cpp::ROS_TYPE_MESSAGE:
           {
-            const MembersType * sub_members = (const MembersType *)member->members_->data;
+            auto sub_members = (const MembersType *)member->members_->data;
             deserializeROSmessage(deser, sub_members, field, call_new);
           }
           break;
@@ -667,7 +665,7 @@ bool TypeSupport<MembersType>::deserializeROSmessage(
           break;
         case ::rosidl_typesupport_introspection_cpp::ROS_TYPE_MESSAGE:
           {
-            const MembersType * sub_members = (const MembersType *)member->members_->data;
+            auto sub_members = (const MembersType *)member->members_->data;
             void * subros_message = nullptr;
             size_t array_size = 0;
             size_t sub_members_size = sub_members->size_of_;
@@ -748,8 +746,7 @@ size_t TypeSupport<MembersType>::calculateMaxSerializedSize(
           break;
         case ::rosidl_typesupport_introspection_cpp::ROS_TYPE_MESSAGE:
           {
-            const MembersType * sub_members =
-              static_cast<const MembersType *>(member->members_->data);
+            auto sub_members = static_cast<const MembersType *>(member->members_->data);
             current_alignment += calculateMaxSerializedSize(sub_members, current_alignment);
           }
           break;
@@ -800,8 +797,7 @@ size_t TypeSupport<MembersType>::calculateMaxSerializedSize(
           break;
         case ::rosidl_typesupport_introspection_cpp::ROS_TYPE_MESSAGE:
           {
-            const MembersType * sub_members =
-              static_cast<const MembersType *>(member->members_->data);
+            auto sub_members = static_cast<const MembersType *>(member->members_->data);
             for (size_t index = 0; index < array_size; ++index) {
               current_alignment += calculateMaxSerializedSize(sub_members, current_alignment);
             }
@@ -871,7 +867,7 @@ bool TypeSupport<MembersType>::serialize(
   assert(data);
   assert(payload);
 
-  eprosima::fastcdr::Cdr * ser = static_cast<eprosima::fastcdr::Cdr *>(data);
+  auto ser = static_cast<eprosima::fastcdr::Cdr *>(data);
   if (payload->max_size >= ser->getSerializedDataLength()) {
     payload->length = static_cast<uint32_t>(ser->getSerializedDataLength());
     payload->encapsulation = ser->endianness() ==
@@ -889,7 +885,7 @@ bool TypeSupport<MembersType>::deserialize(SerializedPayload_t * payload, void *
   assert(data);
   assert(payload);
 
-  eprosima::fastcdr::FastBuffer * buffer = static_cast<eprosima::fastcdr::FastBuffer *>(data);
+  auto buffer = static_cast<eprosima::fastcdr::FastBuffer *>(data);
   buffer->resize(payload->length);
   memcpy(buffer->getBuffer(), payload->data, payload->length);
   return true;
@@ -900,7 +896,7 @@ std::function<uint32_t()> TypeSupport<MembersType>::getSerializedSizeProvider(vo
 {
   assert(data);
 
-  eprosima::fastcdr::Cdr * ser = static_cast<eprosima::fastcdr::Cdr *>(data);
+  auto ser = static_cast<eprosima::fastcdr::Cdr *>(data);
   return [ser]() -> uint32_t {return static_cast<uint32_t>(ser->getSerializedDataLength());};
 }
 

diff --git a/rmw_fastrtps_cpp/include/rmw_fastrtps_cpp/custom_client_info.hpp b/rmw_fastrtps_cpp/include/rmw_fastrtps_cpp/custom_client_info.hpp
@@ -54,7 +54,7 @@ class ClientListener : public eprosima::fastrtps::SubscriberListener
 public:
   explicit ClientListener(CustomClientInfo * info)
   : info_(info), list_has_data_(false),
-    conditionMutex_(NULL), conditionVariable_(NULL) {}
+    conditionMutex_(nullptr), conditionVariable_(nullptr) {}
 
 
   void
@@ -73,7 +73,7 @@ class ClientListener : public eprosima::fastrtps::SubscriberListener
         if (info_->writer_guid_ == response.sample_identity_.writer_guid()) {
           std::lock_guard<std::mutex> lock(internalMutex_);
 
-          if (conditionMutex_ != NULL) {
+          if (conditionMutex_ != nullptr) {
             std::unique_lock<std::mutex> clock(*conditionMutex_);
             list.push_back(response);
             // the change to list_has_data_ needs to be mutually exclusive with
@@ -97,7 +97,7 @@ class ClientListener : public eprosima::fastrtps::SubscriberListener
     std::lock_guard<std::mutex> lock(internalMutex_);
     CustomClientResponse response;
 
-    if (conditionMutex_ != NULL) {
+    if (conditionMutex_ != nullptr) {
       std::unique_lock<std::mutex> clock(*conditionMutex_);
       if (!list.empty()) {
         response = list.front();
@@ -127,8 +127,8 @@ class ClientListener : public eprosima::fastrtps::SubscriberListener
   detachCondition()
   {
     std::lock_guard<std::mutex> lock(internalMutex_);
-    conditionMutex_ = NULL;
-    conditionVariable_ = NULL;
+    conditionMutex_ = nullptr;
+    conditionVariable_ = nullptr;
   }
 
   bool

diff --git a/rmw_fastrtps_cpp/include/rmw_fastrtps_cpp/custom_service_info.hpp b/rmw_fastrtps_cpp/include/rmw_fastrtps_cpp/custom_service_info.hpp
@@ -54,7 +54,7 @@ class ServiceListener : public eprosima::fastrtps::SubscriberListener
 public:
   explicit ServiceListener(CustomServiceInfo * info)
   : info_(info), list_has_data_(false),
-    conditionMutex_(NULL), conditionVariable_(NULL)
+    conditionMutex_(nullptr), conditionVariable_(nullptr)
   {
     (void)info_;
   }
@@ -75,7 +75,7 @@ class ServiceListener : public eprosima::fastrtps::SubscriberListener
 
         std::lock_guard<std::mutex> lock(internalMutex_);
 
-        if (conditionMutex_ != NULL) {
+        if (conditionMutex_ != nullptr) {
           std::unique_lock<std::mutex> clock(*conditionMutex_);
           list.push_back(request);
           // the change to list_has_data_ needs to be mutually exclusive with
@@ -98,7 +98,7 @@ class ServiceListener : public eprosima::fastrtps::SubscriberListener
     std::lock_guard<std::mutex> lock(internalMutex_);
     CustomServiceRequest request;
 
-    if (conditionMutex_ != NULL) {
+    if (conditionMutex_ != nullptr) {
       std::unique_lock<std::mutex> clock(*conditionMutex_);
       if (!list.empty()) {
         request = list.front();
@@ -128,8 +128,8 @@ class ServiceListener : public eprosima::fastrtps::SubscriberListener
   detachCondition()
   {
     std::lock_guard<std::mutex> lock(internalMutex_);
-    conditionMutex_ = NULL;
-    conditionVariable_ = NULL;
+    conditionMutex_ = nullptr;
+    conditionVariable_ = nullptr;
   }
 
   bool

diff --git a/rmw_fastrtps_cpp/include/rmw_fastrtps_cpp/custom_subscriber_info.hpp b/rmw_fastrtps_cpp/include/rmw_fastrtps_cpp/custom_subscriber_info.hpp
@@ -38,7 +38,7 @@ class SubListener : public eprosima::fastrtps::SubscriberListener
 public:
   explicit SubListener(CustomSubscriberInfo * info)
   : data_(0),
-    conditionMutex_(NULL), conditionVariable_(NULL)
+    conditionMutex_(nullptr), conditionVariable_(nullptr)
   {
     // Field is not used right now
     (void)info;
@@ -58,7 +58,7 @@ class SubListener : public eprosima::fastrtps::SubscriberListener
     (void)sub;
     std::lock_guard<std::mutex> lock(internalMutex_);
 
-    if (conditionMutex_ != NULL) {
+    if (conditionMutex_ != nullptr) {
       std::unique_lock<std::mutex> clock(*conditionMutex_);
       // the change to data_ needs to be mutually exclusive with rmw_wait()
       // which checks hasData() and decides if wait() needs to be called
@@ -82,8 +82,8 @@ class SubListener : public eprosima::fastrtps::SubscriberListener
   detachCondition()
   {
     std::lock_guard<std::mutex> lock(internalMutex_);
-    conditionMutex_ = NULL;
-    conditionVariable_ = NULL;
+    conditionMutex_ = nullptr;
+    conditionVariable_ = nullptr;
   }
 
   bool
@@ -97,7 +97,7 @@ class SubListener : public eprosima::fastrtps::SubscriberListener
   {
     std::lock_guard<std::mutex> lock(internalMutex_);
 
-    if (conditionMutex_ != NULL) {
+    if (conditionMutex_ != nullptr) {
       std::unique_lock<std::mutex> clock(*conditionMutex_);
       --data_;
     } else {

diff --git a/rmw_fastrtps_cpp/src/client_service_common.cpp b/rmw_fastrtps_cpp/src/client_service_common.cpp
@@ -27,7 +27,7 @@ get_request_ptr(const void * untyped_service_members, const char * typesupport)
       untyped_service_members);
   }
   RMW_SET_ERROR_MSG("Unknown typesupport identifier");
-  return NULL;
+  return nullptr;
 }
 
 const void *
@@ -41,5 +41,5 @@ get_response_ptr(const void * untyped_service_members, const char * typesupport)
       untyped_service_members);
   }
   RMW_SET_ERROR_MSG("Unknown typesupport identifier");
-  return NULL;
+  return nullptr;
 }
diff --git a/rmw_fastrtps_cpp/src/client_service_common.hpp b/rmw_fastrtps_cpp/src/client_service_common.hpp
@@ -23,7 +23,7 @@ const void * get_request_ptr(const void * untyped_service_members)
   auto service_members = static_cast<const ServiceType *>(untyped_service_members);
   if (!service_members) {
     RMW_SET_ERROR_MSG("service members handle is null");
-    return NULL;
+    return nullptr;
   }
   return service_members->request_members_;
 }
@@ -36,7 +36,7 @@ const void * get_response_ptr(const void * untyped_service_members)
   auto service_members = static_cast<const ServiceType *>(untyped_service_members);
   if (!service_members) {
     RMW_SET_ERROR_MSG("service members handle is null");
-    return NULL;
+    return nullptr;
   }
   return service_members->response_members_;
 }

diff --git a/rmw_fastrtps_cpp/src/get_client.cpp b/rmw_fastrtps_cpp/src/get_client.cpp
@@ -24,25 +24,25 @@ eprosima::fastrtps::Publisher *
 get_request_publisher(rmw_client_t * client)
 {
   if (!client) {
-    return NULL;
+    return nullptr;
   }
   if (client->implementation_identifier != eprosima_fastrtps_identifier) {
-    return NULL;
+    return nullptr;
   }
-  CustomClientInfo * impl = static_cast<CustomClientInfo *>(client->data);
+  auto impl = static_cast<CustomClientInfo *>(client->data);
   return impl->request_publisher_;
 }
 
 eprosima::fastrtps::Subscriber *
 get_response_subscriber(rmw_client_t * client)
 {
   if (!client) {
-    return NULL;
+    return nullptr;
   }
   if (client->implementation_identifier != eprosima_fastrtps_identifier) {
-    return NULL;
+    return nullptr;
   }
-  CustomClientInfo * impl = static_cast<CustomClientInfo *>(client->data);
+  auto impl = static_cast<CustomClientInfo *>(client->data);
   return impl->response_subscriber_;
 }
 

diff --git a/rmw_fastrtps_cpp/src/get_participant.cpp b/rmw_fastrtps_cpp/src/get_participant.cpp
@@ -24,12 +24,12 @@ eprosima::fastrtps::Participant *
 get_participant(rmw_node_t * node)
 {
   if (!node) {
-    return NULL;
+    return nullptr;
   }
   if (node->implementation_identifier != eprosima_fastrtps_identifier) {
-    return NULL;
+    return nullptr;
   }
-  CustomParticipantInfo * impl = static_cast<CustomParticipantInfo *>(node->data);
+  auto impl = static_cast<CustomParticipantInfo *>(node->data);
   return impl->participant;
 }
 

diff --git a/rmw_fastrtps_cpp/src/get_publisher.cpp b/rmw_fastrtps_cpp/src/get_publisher.cpp
@@ -24,12 +24,12 @@ eprosima::fastrtps::Publisher *
 get_publisher(rmw_publisher_t * publisher)
 {
   if (!publisher) {
-    return NULL;
+    return nullptr;
   }
   if (publisher->implementation_identifier != eprosima_fastrtps_identifier) {
-    return NULL;
+    return nullptr;
   }
-  CustomPublisherInfo * impl = static_cast<CustomPublisherInfo *>(publisher->data);
+  auto impl = static_cast<CustomPublisherInfo *>(publisher->data);
   return impl->publisher_;
 }