From 0d916793328b67a8c47075178a7e106e87da79f3 Mon Sep 17 00:00:00 2001
From: Botond Baranyi <botond.baranyi@ericsson.com>
Date: Fri, 5 May 2017 17:31:07 +0200
Subject: [PATCH] Fixed unused parameter warning in generated JSON coder
functions
Change-Id: I92d111da8d77bb61f2f8039042c49e694c4bce05
Signed-off-by: Botond Baranyi <botond.baranyi@ericsson.com>
---
compiler2/record.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/compiler2/record.c b/compiler2/record.c
index 0ee6d5268..aefcbac65 100644
--- a/compiler2/record.c
+++ b/compiler2/record.c
@@ -4379,7 +4379,7 @@ void defRecordClass1(const struct_def *sdef, output_struct *output)
" TTCN_EncDec_ErrorContext::error(TTCN_EncDec::ET_UNBOUND,\n"
" \"Encoding an unbound value of type %s.\");\n"
" return -1;\n"
- " }\n\n", name, !sdef->jsonAsValue ? " p_td" : "", dispname);
+ " }\n\n", name, (sdef->nElements == 1 && !sdef->jsonAsValue) ? " p_td" : "", dispname);
if (sdef->nElements == 1) {
if (!sdef->jsonAsValue) {
src = mputstr(src, " if (NULL != p_td.json && p_td.json->as_value) {\n");
@@ -4428,7 +4428,7 @@ void defRecordClass1(const struct_def *sdef, output_struct *output)
// JSON decode, RT1
src = mputprintf(src,
"int %s::JSON_decode(const TTCN_Typedescriptor_t&%s, JSON_Tokenizer& p_tok, boolean p_silent)\n"
- "{\n", name, !sdef->jsonAsValue ? " p_td" : "");
+ "{\n", name, (sdef->nElements == 1 && !sdef->jsonAsValue) ? " p_td" : "");
if (sdef->nElements == 1) {
if (!sdef->jsonAsValue) {
--
GitLab