diff options
| author | vzykov <vzykov@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-03-02 14:58:28 +0000 |
|---|---|---|
| committer | vzykov <vzykov@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-03-02 14:58:28 +0000 |
| commit | 2e9b3cd2399ade34f807800ac432b41ff67fb776 (patch) | |
| tree | 54094de7921363bc3e2dfef15785d49777ae5e3a /CIAO | |
| parent | 239c28bd1dd20d3051603f86730c96528faeb864 (diff) | |
| download | ATCD-2e9b3cd2399ade34f807800ac432b41ff67fb776.tar.gz | |
Wed Mar 2 14:56:28 UTC 2011 Vladimir Zykov <vladimir.zykov@prismtech.com>
* tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp:
Made use of transfer_scope_elements() defined in ast_home.
Diffstat (limited to 'CIAO')
| -rw-r--r-- | CIAO/ChangeLog | 5 | ||||
| -rw-r--r-- | CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp | 17 |
2 files changed, 7 insertions, 15 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index fc1cd0d6ae6..bc9d2c30701 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,8 @@ +Wed Mar 2 14:56:28 UTC 2011 Vladimir Zykov <vladimir.zykov@prismtech.com> + + * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp: + Made use of transfer_scope_elements() defined in ast_home. + Tue Feb 15 10:11:12 UTC 2011 Marcel Smit <msmit@remedy.nl> * tests/CIF/Events/client.cpp: diff --git a/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp b/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp index 36f33fc5932..c80c9fb99f7 100644 --- a/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp +++ b/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp @@ -609,6 +609,7 @@ idl3_to_idl2_visitor::visit_home (AST_Home *node) *os << be_uidt_nl << "};" << be_nl << be_nl; + xplicit.set_defined_in (0); xplicit.destroy (); sn->destroy (); delete sn; @@ -818,20 +819,7 @@ idl3_to_idl2_visitor::tranfer_scope_elements (AST_Home *src, { // Transfer the elements of the home's scope to the temporary // explicit home interface. - for (UTL_ScopeActiveIterator src_iter (src, UTL_Scope::IK_decls); - ! src_iter.is_done (); - src_iter.next ()) - { - AST_Decl *d = src_iter.item (); - d->set_defined_in (&dst); - UTL_ScopedName *new_name = - this->create_scoped_name (0, - d->local_name ()->get_string (), - 0, - &dst); - d->set_name (new_name); - dst.add_to_scope (d); - } + src->transfer_scope_elements (&dst); // Visit the transferred scope elements normally to generate the IDL. // This way referenced items will have the interface's name in the @@ -915,4 +903,3 @@ idl3_to_idl2_visitor::visit_porttype_scope_mirror ( return 0; } - |