diff options
Diffstat (limited to 'TAO/TAO_IDL')
| -rw-r--r-- | TAO/TAO_IDL/be/be_scope.cpp | 44 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_structure.cpp | 5 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_typedef.cpp | 1 |
3 files changed, 21 insertions, 29 deletions
diff --git a/TAO/TAO_IDL/be/be_scope.cpp b/TAO/TAO_IDL/be/be_scope.cpp index 47920cb8499..ac49c68cf48 100644 --- a/TAO/TAO_IDL/be/be_scope.cpp +++ b/TAO/TAO_IDL/be/be_scope.cpp @@ -323,15 +323,13 @@ be_scope::gen_encapsulation (void) { // get the next AST decl node d = si->item (); - if (!d->imported ()) + + bd = be_decl::narrow_from_decl (d); + if (bd->gen_encapsulation () == -1) { - bd = be_decl::narrow_from_decl (d); - if (bd->gen_encapsulation () == -1) - { - // failure - return -1; - } - } + // failure + return -1; + } si->next (); } // end of while delete si; // free the iterator object @@ -358,25 +356,21 @@ be_scope::tc_encap_len (void) { // get the next AST decl node d = si->item (); - if (!d->imported ()) - { - // we are not imported. - // NOTE: Our assumptin here is that whatever scope we are in, the - // node type that shows up here *MUST* be valid according to the - // IDL grammar. We do not check for this since the front end must - // have taken care of weeding out such errors + // NOTE: Our assumptin here is that whatever scope we are in, the + // node type that shows up here *MUST* be valid according to the + // IDL grammar. We do not check for this since the front end must + // have taken care of weeding out such errors - bd = be_decl::narrow_from_decl (d); - if (bd != 0) - { - encap_len += bd->tc_encap_len (); - } - else - { - ACE_DEBUG ((LM_DEBUG, "WARNING (%N:%l): " - "narrow_from_decl returned 0\n")); - } + bd = be_decl::narrow_from_decl (d); + if (bd != 0) + { + encap_len += bd->tc_encap_len (); + } + else + { + ACE_DEBUG ((LM_DEBUG, "WARNING (%N:%l): " + "narrow_from_decl returned 0\n")); } si->next (); } // end of while diff --git a/TAO/TAO_IDL/be/be_structure.cpp b/TAO/TAO_IDL/be/be_structure.cpp index 0efbdef1eb4..eef770bbcc2 100644 --- a/TAO/TAO_IDL/be/be_structure.cpp +++ b/TAO/TAO_IDL/be/be_structure.cpp @@ -54,10 +54,7 @@ be_structure::compute_member_count (void) { // get the next AST decl node d = si->item (); - if (!d->imported ()) - { - this->member_count_++; - } + this->member_count_++; si->next (); } // end of while delete si; // free the iterator object diff --git a/TAO/TAO_IDL/be/be_typedef.cpp b/TAO/TAO_IDL/be/be_typedef.cpp index c55aa2f3738..ed1beb59f17 100644 --- a/TAO/TAO_IDL/be/be_typedef.cpp +++ b/TAO/TAO_IDL/be/be_typedef.cpp @@ -227,6 +227,7 @@ be_typedef::gen_typecode (void) { return -1; } + cs->decr_indent (0); return 0; } |