Use default alignment when loaning for request/response (ros2#76)

Signed-off-by: Simon Hoinkis <[email protected]>
ApexAI · Jan 12, 2023 · 6546111 · 6546111
1 parent b186509
commit 6546111
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 6 deletions.
diff --git a/rmw_iceoryx_cpp/src/rmw_request.cpp b/rmw_iceoryx_cpp/src/rmw_request.cpp
@@ -61,7 +61,7 @@ rmw_send_request(
 
   iceoryx_client->loan(
     iceoryx_client_abstraction->request_size_,
-    iceoryx_client_abstraction->request_alignment_)
+    iox::CHUNK_DEFAULT_USER_PAYLOAD_ALIGNMENT)
   .and_then(
     [&](void * requestPayload) {
       auto requestHeader = iox::popo::RequestHeader::fromPayload(requestPayload);

diff --git a/rmw_iceoryx_cpp/src/rmw_response.cpp b/rmw_iceoryx_cpp/src/rmw_response.cpp
@@ -158,7 +158,7 @@ rmw_send_response(
 
   iceoryx_server->loan(
     iceoryx_request_header, iceoryx_server_abstraction->response_size_,
-    iceoryx_server_abstraction->response_alignment_)
+    iox::CHUNK_DEFAULT_USER_PAYLOAD_ALIGNMENT)
   .and_then(
     [&](void * responsePayload) {
       if (iceoryx_server_abstraction->is_fixed_size_) {

diff --git a/rmw_iceoryx_cpp/src/types/iceoryx_client.hpp b/rmw_iceoryx_cpp/src/types/iceoryx_client.hpp
@@ -37,8 +37,6 @@ struct IceoryxClient
   iox::popo::UntypedClient * const iceoryx_client_;
   bool is_fixed_size_;
   size_t request_size_;
-  /// @todo How can the full type be aquired via rosidl to do an 'alignof()'?
-  uint32_t request_alignment_{8};
   int64_t sequence_id_;
 };
 

diff --git a/rmw_iceoryx_cpp/src/types/iceoryx_server.hpp b/rmw_iceoryx_cpp/src/types/iceoryx_server.hpp
@@ -37,8 +37,6 @@ struct IceoryxServer
   iox::popo::UntypedServer * const iceoryx_server_;
   bool is_fixed_size_;
   size_t response_size_;
-  /// @todo Is there a way to get the aligment for a complete type via the rosidl?
-  uint32_t response_alignment_{8};
   const void * request_payload_{nullptr};
 };