Commit b4f039e9 authored by Kristof Szabados's avatar Kristof Szabados
Browse files

an other temporary code that fixes both the compileonly and the xer issue...


an other temporary code that fixes both the compileonly and the xer issue (technically revoking the interested commit.)
Signed-off-by: Kristof Szabados's avatarKristof Szabados <Kristof.Szabados@ericsson.com>
parent 6556910a
...@@ -7414,7 +7414,7 @@ namespace Common { ...@@ -7414,7 +7414,7 @@ namespace Common {
if (t->is_tagged() || t->rawattrib || t->textattrib || t->jsonattrib || if (t->is_tagged() || t->rawattrib || t->textattrib || t->jsonattrib ||
(!t->is_asn1() && t->hasEncodeAttr(get_encoding_name(CT_JSON))) || (!t->is_asn1() && t->hasEncodeAttr(get_encoding_name(CT_JSON))) ||
(t->xerattrib && !t->xerattrib->empty() ) || (t->xerattrib && !t->xerattrib->empty() ) ||
(t->oerattrib /*&& !t->oerattrib->empty()*/ && t->is_asn1())) (t->oerattrib && !t->oerattrib->empty() && t->is_asn1()))
{ {
return t->get_genname_own(p_scope); return t->get_genname_own(p_scope);
} }
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
OerAST::OerAST() : OerAST::OerAST() :
bytes(-1), bytes(-1),
signed_(true), signed_(false),
length(-1), length(-1),
extendable(false), extendable(false),
nr_of_root_comps(0), nr_of_root_comps(0),
...@@ -33,6 +33,6 @@ OerAST::~OerAST() { ...@@ -33,6 +33,6 @@ OerAST::~OerAST() {
} }
bool OerAST::empty() const { bool OerAST::empty() const {
return bytes == -1 && signed_ && length == -1 && return bytes == -1 && signed_ == false && length == -1 &&
extendable == false && nr_of_root_comps == 0 && ext_attr_groups.empty() && p.empty(); extendable == false && nr_of_root_comps == 0 && ext_attr_groups.empty() && p.empty();
} }
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