Fix packed array elements in the runtime to be passed by reference

ndsev · Sep 3, 2024 · f7e0e33 · f7e0e33
1 parent ee61625
commit f7e0e33
Showing 1 changed file with 26 additions and 2 deletions.
diff --git a/compiler/extensions/cpp/runtime/src/zserio/Array.h b/compiler/extensions/cpp/runtime/src/zserio/Array.h
@@ -91,15 +91,39 @@ void checkOffset(const OWNER_TYPE&, size_t, size_t)
 
 // call the initContext method properly on packed array traits
 template <typename PACKED_ARRAY_TRAITS, typename OWNER_TYPE, typename PACKING_CONTEXT,
-        typename std::enable_if<has_owner_type<PACKED_ARRAY_TRAITS>::value, int>::type = 0>
+        typename std::enable_if<has_owner_type<PACKED_ARRAY_TRAITS>::value &&
+                        !std::is_scalar<typename PACKED_ARRAY_TRAITS::ElementType>::value,
+                int>::type = 0>
+void packedArrayTraitsInitContext(const OWNER_TYPE& owner, PACKING_CONTEXT& context,
+        const typename PACKED_ARRAY_TRAITS::ElementType& element)
+{
+    PACKED_ARRAY_TRAITS::initContext(owner, context, element);
+}
+
+template <typename PACKED_ARRAY_TRAITS, typename OWNER_TYPE, typename PACKING_CONTEXT,
+        typename std::enable_if<has_owner_type<PACKED_ARRAY_TRAITS>::value &&
+                        std::is_scalar<typename PACKED_ARRAY_TRAITS::ElementType>::value,
+                int>::type = 0>
 void packedArrayTraitsInitContext(
         const OWNER_TYPE& owner, PACKING_CONTEXT& context, typename PACKED_ARRAY_TRAITS::ElementType element)
 {
     PACKED_ARRAY_TRAITS::initContext(owner, context, element);
 }
 
 template <typename PACKED_ARRAY_TRAITS, typename OWNER_TYPE, typename PACKING_CONTEXT,
-        typename std::enable_if<!has_owner_type<PACKED_ARRAY_TRAITS>::value, int>::type = 0>
+        typename std::enable_if<!has_owner_type<PACKED_ARRAY_TRAITS>::value &&
+                        !std::is_scalar<typename PACKED_ARRAY_TRAITS::ElementType>::value,
+                int>::type = 0>
+void packedArrayTraitsInitContext(
+        const OWNER_TYPE&, PACKING_CONTEXT& context, const typename PACKED_ARRAY_TRAITS::ElementType& element)
+{
+    PACKED_ARRAY_TRAITS::initContext(context, element);
+}
+
+template <typename PACKED_ARRAY_TRAITS, typename OWNER_TYPE, typename PACKING_CONTEXT,
+        typename std::enable_if<!has_owner_type<PACKED_ARRAY_TRAITS>::value &&
+                        std::is_scalar<typename PACKED_ARRAY_TRAITS::ElementType>::value,
+                int>::type = 0>
 void packedArrayTraitsInitContext(
         const OWNER_TYPE&, PACKING_CONTEXT& context, typename PACKED_ARRAY_TRAITS::ElementType element)
 {