From ca3994c88e4270169e7ce1c774988323d47426a8 Mon Sep 17 00:00:00 2001 From: Maximilian Schmeller Date: Mon, 3 Jun 2024 18:19:59 +0900 Subject: [PATCH] fix(nebula_common): move EIGEN_ALIGN16 attribute to be clang-compatible --- .../nebula_common/continental/continental_ars548.hpp | 8 ++++---- nebula_common/include/nebula_common/point_types.hpp | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/nebula_common/include/nebula_common/continental/continental_ars548.hpp b/nebula_common/include/nebula_common/continental/continental_ars548.hpp index dbb5ac6bc..949b025be 100644 --- a/nebula_common/include/nebula_common/continental/continental_ars548.hpp +++ b/nebula_common/include/nebula_common/continental/continental_ars548.hpp @@ -579,7 +579,7 @@ struct FilterStatusPacket #pragma pack(pop) -struct PointARS548Detection +struct EIGEN_ALIGN16 PointARS548Detection { PCL_ADD_POINT4D; float azimuth; @@ -598,11 +598,11 @@ struct PointARS548Detection uint16_t object_id; uint8_t ambiguity_flag; EIGEN_MAKE_ALIGNED_OPERATOR_NEW -} EIGEN_ALIGN16; +}; // Note we only use a subset of the data since POINT_CLOUD_REGISTER_POINT_STRUCT has a limit in the // number of fields -struct PointARS548Object +struct EIGEN_ALIGN16 PointARS548Object { PCL_ADD_POINT4D; uint32_t id; @@ -623,7 +623,7 @@ struct PointARS548Object float shape_width_edge_mean; float dynamics_orientation_rate_mean; EIGEN_MAKE_ALIGNED_OPERATOR_NEW -} EIGEN_ALIGN16; +}; } // namespace continental_ars548 } // namespace drivers diff --git a/nebula_common/include/nebula_common/point_types.hpp b/nebula_common/include/nebula_common/point_types.hpp index 6f3feabe9..260b7b9db 100644 --- a/nebula_common/include/nebula_common/point_types.hpp +++ b/nebula_common/include/nebula_common/point_types.hpp @@ -8,13 +8,13 @@ namespace nebula { namespace drivers { -struct PointXYZIR +struct EIGEN_ALIGN16 PointXYZIR { PCL_ADD_POINT4D; float intensity; uint16_t ring; EIGEN_MAKE_ALIGNED_OPERATOR_NEW -} EIGEN_ALIGN16; +}; struct PointXYZICATR { @@ -43,7 +43,7 @@ struct PointXYZIRCAEDT std::uint32_t time_stamp; }; -struct PointXYZIRADT +struct EIGEN_ALIGN16 PointXYZIRADT { PCL_ADD_POINT4D; float intensity; @@ -53,7 +53,7 @@ struct PointXYZIRADT uint8_t return_type; double time_stamp; EIGEN_MAKE_ALIGNED_OPERATOR_NEW -} EIGEN_ALIGN16; +}; using NebulaPoint = PointXYZIRCAEDT; using NebulaPointPtr = std::shared_ptr;