From c8f5585ba77905a0f422bbab54605ae5978ae709 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Wed, 24 Jan 2024 19:03:18 +0000 Subject: [PATCH] Use [[no_unique_address]] in CargoList Re-use tail padding of ring_buffer for count --- src/cargopacket.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cargopacket.h b/src/cargopacket.h index 69b474f7eb..317c889aa5 100644 --- a/src/cargopacket.h +++ b/src/cargopacket.h @@ -318,10 +318,10 @@ public: }; protected: - uint count; ///< Cache for the number of cargo entities. uint64_t cargo_periods_in_transit; ///< Cache for the sum of number of cargo aging periods in transit of each entity; comparable to man-hours. - Tcont packets; ///< The cargo packets in this list. + NO_UNIQUE_ADDRESS Tcont packets; ///< The cargo packets in this list. + uint count; ///< Cache for the number of cargo entities. void AddToCache(const CargoPacket *cp);