Commit 424f254f authored by Botond Baranyi's avatar Botond Baranyi
Browse files

Minor fixes to new JSON variants (bug 553584)



Change-Id: Ic8d8827769119c56d6d9fa4dae8303bf039cca32
Signed-off-by: Botond Baranyi's avatarBotond Baranyi <botond.baranyi@ericsson.com>
parent 6c6bc1d0
......@@ -3272,7 +3272,7 @@ namespace Common {
jsonattrib->use_null = true;
}
else {
error("Invalid attribute, 'JSON:object' requires the type to have "
error("Invalid attribute, 'JSON:literal' requires the type to have "
"only one enumerated item");
}
}
......
......@@ -96,7 +96,7 @@ boolean JsonAST::empty() const
default_value == NULL && metainfo_unbound == false && as_number == false &&
tag_list == NULL && as_map == false && enum_texts.size() == 0 &&
use_null == false && type_indicator != JSON_OBJECT &&
type_indicator != JSON_OBJECT_MEMBER && type_indicator != JSON_LITERAL &&
type_indicator != JSON_LITERAL &&
(string_escaping == ESCAPING_UNSET || string_escaping == ESCAPE_AS_SHORT);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment