Commit eae1326e authored by Botond Baranyi's avatar Botond Baranyi
Browse files

Fixed type descriptor generation fault caused by OER changes (bug 538482)



Change-Id: I78f73035c379d649a9ae553e6e349493df382c29
Signed-off-by: Botond Baranyi's avatarBotond Baranyi <botond.baranyi@ericsson.com>
parent bb399dcc
...@@ -7418,6 +7418,7 @@ namespace Common { ...@@ -7418,6 +7418,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() ) ||
(asn1_xer && t->is_asn1() && t->ownertype != OT_RECORD_OF && t->ownertype != OT_REF_SPEC) ||
(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_(false), signed_(true),
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_ == false && length == -1 && return bytes == -1 && signed_ && 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();
} }
...@@ -4,4 +4,6 @@ TtemplateOctetstr_se[qt].cc ...@@ -4,4 +4,6 @@ TtemplateOctetstr_se[qt].cc
TtemplateOctetstr_se[qt]of.cc TtemplateOctetstr_se[qt]of.cc
TtemplateOctetstr_union.cc TtemplateOctetstr_union.cc
TtemplateOctetstr.hh TtemplateOctetstr.hh
TtemplateOctetstringDecmatch*.cc
TtemplateOctetstringDecmatch*.hh
templateOctetstr.log templateOctetstr.log
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