From 27ba2d7c663f854adb5dd1958fcfa87d76e94891 Mon Sep 17 00:00:00 2001
From: BenceJanosSzabo <bence.janos.szabo@ericsson.com>
Date: Tue, 6 Dec 2016 12:25:01 +0100
Subject: [PATCH] XER: another RT2 fix
Change-Id: I9c63ad2803e107ea02060aadb2d56bfaa52fa418
Signed-off-by: BenceJanosSzabo <bence.janos.szabo@ericsson.com>
---
compiler2/union.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/compiler2/union.c b/compiler2/union.c
index 7110d08e7..f71a23513 100644
--- a/compiler2/union.c
+++ b/compiler2/union.c
@@ -1350,9 +1350,9 @@ void defUnionClass(struct_def const *sdef, output_struct *output)
src = mputstr(src, " return FALSE;\n}\n\n");
src = mputprintf(src,
- "char ** %s::collect_ns(const XERdescriptor_t& p_td, size_t& num, boolean& def_ns, unsigned int%s) const {\n"
+ "char ** %s::collect_ns(const XERdescriptor_t& p_td, size_t& num, boolean& def_ns, unsigned int flavor) const {\n"
" size_t num_collected;\n"
- " char **collected_ns = Base_Type::collect_ns(p_td, num_collected, def_ns);\n"
+ " char **collected_ns = Base_Type::collect_ns(p_td, num_collected, def_ns, flavor);\n"
/* Two-level new memory allocated */
" char **new_ns;\n"
" size_t num_new;\n"
@@ -1361,7 +1361,6 @@ void defUnionClass(struct_def const *sdef, output_struct *output)
" boolean def_ns_1 = FALSE;\n"
" switch (union_selection) {\n"
, name
- , sdef->nElements > 0 ? " flavor" : ""
);
for (i = 0; i < sdef->nElements; i++) {
src = mputprintf(src,
--
GitLab