fixed allocator compilation problems

Signed-off-by: Gonzalo de Pedro <[email protected]>
clalancette · Dec 7, 2021 · 3fcf467 · 3fcf467
1 parent dd64c98
commit 3fcf467
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/rclcpp/include/rclcpp/experimental/subscription_intra_process_buffer.hpp b/rclcpp/include/rclcpp/experimental/subscription_intra_process_buffer.hpp
@@ -76,20 +76,20 @@ class SubscriptionIntraProcessBuffer : public ROSMessageIntraProcessBuffer<ROSMe
 
   using BufferUniquePtr = typename rclcpp::experimental::buffers::IntraProcessBuffer<
     SubscribedType,
-    SubscribedTypeAllocator,
+    Alloc,
     SubscribedTypeDeleter
     >::UniquePtr;
 
   SubscriptionIntraProcessBuffer(
-    std::shared_ptr<SubscribedTypeAllocator> allocator,
+    std::shared_ptr<Alloc> allocator,
     rclcpp::Context::SharedPtr context,
     const std::string & topic_name,
     const rclcpp::QoS & qos_profile,
     rclcpp::IntraProcessBufferType buffer_type)
-  : ROSMessageIntraProcessBuffer<ROSMessageT, ROSMessageTypeAllocator, ROSMessageTypeDeleter>(context, topic_name, qos_profile)
+  : ROSMessageIntraProcessBuffer<ROSMessageT, Alloc, ROSMessageTypeDeleter>(context, topic_name, qos_profile)
   {
     // Create the intra-process buffer.
-    buffer_ = rclcpp::experimental::create_intra_process_buffer<SubscribedType, SubscribedTypeAllocator, SubscribedTypeDeleter>(
+    buffer_ = rclcpp::experimental::create_intra_process_buffer<SubscribedType, Alloc, SubscribedTypeDeleter>(
       buffer_type,
       qos_profile,
       allocator);

diff --git a/rclcpp/include/rclcpp/subscription.hpp b/rclcpp/include/rclcpp/subscription.hpp
@@ -201,7 +201,7 @@ class Subscription : public SubscriptionBase
       auto context = node_base->get_context();
       subscription_intra_process_ = std::make_shared<SubscriptionIntraProcessT>(
         callback,
-        std::make_shared<SubscribedTypeAllocator>(*options.get_allocator()),
+        options.get_allocator(),
         context,
         this->get_topic_name(),  // important to get like this, as it has the fully-qualified name
         qos_profile,
@@ -407,7 +407,7 @@ class Subscription : public SubscriptionBase
 
   using SubscriptionIntraProcessT = rclcpp::experimental::SubscriptionIntraProcess<
     SubscribedType,
-    SubscribedTypeAllocator,
+    AllocatorT,
     SubscribedTypeDeleter>;
   std::shared_ptr<SubscriptionIntraProcessT> subscription_intra_process_;