summaryrefslogtreecommitdiff
path: root/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp')
-rw-r--r--TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp18
1 files changed, 10 insertions, 8 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
index a3d720f5608..1cae88fdac3 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
@@ -3013,15 +3013,16 @@ be_visitor_typecode_defn::compute_tc_size (be_typedef *node)
else
{
if (this->queue_insert (this->compute_queue_, node, this->tc_offset_) == 0)
- {
- ACE_ERROR_RETURN ((LM_ERROR,
- "(%N:%l) be_visitor_typecode_defn::"
- "compute_tc_size (typedef) - "
- "queue insert failed\n"),
- -1);
- }
+ {
+ ACE_ERROR_RETURN ((LM_ERROR,
+ "(%N:%l) be_visitor_typecode_defn::"
+ "compute_tc_size (typedef) - "
+ "queue insert failed\n"),
+ -1);
+ }
this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN);
+
if (node->accept (this) == -1)
{
ACE_ERROR_RETURN ((LM_ERROR,
@@ -3053,6 +3054,7 @@ be_visitor_typecode_defn::compute_encap_length (be_typedef *node)
// add the encapsulation length of our base type
bt = be_type::narrow_from_decl (node->base_type ());
this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_TC_SIZE);
+
if (!bt || bt->accept (this) == -1)
{
ACE_ERROR_RETURN ((LM_ERROR,
@@ -3064,7 +3066,6 @@ be_visitor_typecode_defn::compute_encap_length (be_typedef *node)
this->computed_encap_len_ = encap_len + this->computed_tc_size_;
return this->computed_encap_len_;
-
}
@@ -3427,6 +3428,7 @@ be_visitor_typecode_defn::gen_repoID (be_decl *node)
// size of the repoID field
this->tc_offset_ += (arrlen + 1) * sizeof (ACE_CDR::ULong);
}
+
*os << "\n";
return;