From 90daad514190fd46493671ca9f50195572454213 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 7 Aug 2023 21:26:18 +0200 Subject: [PATCH] Replace uint64_t by 8 in alignas specifier (#3752) (#3767) Signed-off-by: Raul Sanchez-Mateos (cherry picked from commit 9ae27f174c1a33bf539c589ce2f1d6630052d1b0) Co-authored-by: Raul Sanchez-Mateos Lizano --- src/cpp/rtps/DataSharing/DataSharingNotification.hpp | 2 +- src/cpp/rtps/DataSharing/DataSharingPayloadPool.hpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cpp/rtps/DataSharing/DataSharingNotification.hpp b/src/cpp/rtps/DataSharing/DataSharingNotification.hpp index 167f4bcd9eb..a63b6ca4f41 100644 --- a/src/cpp/rtps/DataSharing/DataSharingNotification.hpp +++ b/src/cpp/rtps/DataSharing/DataSharingNotification.hpp @@ -93,7 +93,7 @@ class DataSharingNotification #pragma warning(push) #pragma warning(disable:4324) - struct alignas (uint64_t) Notification + struct alignas (8) Notification { //! CV to wait for new notifications Segment::condition_variable notification_cv; diff --git a/src/cpp/rtps/DataSharing/DataSharingPayloadPool.hpp b/src/cpp/rtps/DataSharing/DataSharingPayloadPool.hpp index 5b3dc66c7e3..f97d7a0cb8d 100644 --- a/src/cpp/rtps/DataSharing/DataSharingPayloadPool.hpp +++ b/src/cpp/rtps/DataSharing/DataSharingPayloadPool.hpp @@ -142,7 +142,7 @@ class DataSharingPayloadPool : public IPayloadPool #pragma warning(push) #pragma warning(disable:4324) - class alignas (uint64_t) PayloadNode + class alignas (8) PayloadNode { struct PayloadNodeMetaData @@ -338,7 +338,7 @@ class DataSharingPayloadPool : public IPayloadPool }; - struct alignas (uint64_t) PoolDescriptor + struct alignas (8) PoolDescriptor { uint32_t history_size; //< Number of payloads in the history uint64_t notified_begin; //< The index of the oldest history entry already notified (ready to read)