From 3ab75b83ce4d4b72abd8d07ae3be11029c299737 Mon Sep 17 00:00:00 2001
From: TSC21 <n.marques21@hotmail.com>
Date: Wed, 15 May 2019 23:58:42 +0100
Subject: [PATCH] microcdr and IDL: remove field ordering, causing improper
serialization/deserialization
---
msg/templates/uorb_microcdr/msg.cpp.template | 8 ++------
msg/templates/urtps/msg.idl.template | 5 +----
2 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/msg/templates/uorb_microcdr/msg.cpp.template b/msg/templates/uorb_microcdr/msg.cpp.template
index a08ddcb55e..fdbdb9d2ee 100644
--- a/msg/templates/uorb_microcdr/msg.cpp.template
+++ b/msg/templates/uorb_microcdr/msg.cpp.template
@@ -131,14 +131,10 @@ def add_deserialize_functions(fields, scope_name):
add_deserialize_functions(children_fields, name + ('[%d].' %i))
def add_code_to_serialize():
- # sort fields (using a stable sort) as in the declaration of the type
- sorted_fields = sorted(spec.parsed_fields(), key=sizeof_field_type, reverse=True)
- add_serialize_functions(sorted_fields, "")
+ add_serialize_functions(spec.parsed_fields(), "")
def add_code_to_deserialize():
- # sort fields (using a stable sort) as in the declaration of the type
- sorted_fields = sorted(spec.parsed_fields(), key=sizeof_field_type, reverse=True)
- add_deserialize_functions(sorted_fields, "")
+ add_deserialize_functions(spec.parsed_fields(), "")
}@
void serialize_@(topic_name)(ucdrBuffer *writer, const struct @(uorb_struct) *input, char *output, uint32_t *length)
diff --git a/msg/templates/urtps/msg.idl.template b/msg/templates/urtps/msg.idl.template
index 3cfabba707..57536f3629 100644
--- a/msg/templates/urtps/msg.idl.template
+++ b/msg/templates/urtps/msg.idl.template
@@ -78,10 +78,7 @@ def add_msg_field(field):
def add_msg_fields():
- # sort fields (using a stable sort) as in the declaration of the type
- sorted_fields = sorted(spec.parsed_fields(),
- key=sizeof_field_type, reverse=True)
- for field in sorted_fields:
+ for field in spec.parsed_fields():
add_msg_field(field)
--
GitLab