diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-09-16 02:29:12 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-09-16 02:29:12 +0000 |
| commit | 47b4a46fb84d701450b68a974f2473895a01208b (patch) | |
| tree | dad06a045d66d76740fee29d9a5430f19d19e80a | |
| parent | b470173705a93b3064407a5112843095b3b67d9a (diff) | |
| download | ATCD-47b4a46fb84d701450b68a974f2473895a01208b.tar.gz | |
ChangeLogTag: Wed Sep 15 21:25:28 2004 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 11 | ||||
| -rw-r--r-- | TAO/TAO_IDL/ast/ast_root.cpp | 2 | ||||
| -rw-r--r-- | TAO/TAO_IDL/util/utl_scope.cpp | 2 |
3 files changed, 13 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 7accde80526..d5f50edb1ac 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,14 @@ +Wed Sep 15 21:25:28 2004 Jeff Parsons <j.parsons@vanderbilt.edu> + + * TAO_IDL/ast/ast_root.cpp: + * TAO_IDL/util/utl_scope.cpp: + + Fixed cleanup of root scope between IDL files when + multiple IDL files are passed on the command line. + The cleanup needs to remove all declarations and + references except those for the predefined types, + and there was an off-by-one error. + Tue Sep 14 17:12:41 2004 J.T. Conklin <jtc@acorntoolworks.com> * orbsvcs/orbsvcs/Makefile.am: diff --git a/TAO/TAO_IDL/ast/ast_root.cpp b/TAO/TAO_IDL/ast/ast_root.cpp index 1cd6826c64d..2325c2684cd 100644 --- a/TAO/TAO_IDL/ast/ast_root.cpp +++ b/TAO/TAO_IDL/ast/ast_root.cpp @@ -230,7 +230,7 @@ AST_Root::destroy () if (d->node_type () == AST_Decl::NT_pre_defined) { - j = i; + j = i + 1; break; } diff --git a/TAO/TAO_IDL/util/utl_scope.cpp b/TAO/TAO_IDL/util/utl_scope.cpp index 47facd16613..ddd109073fc 100644 --- a/TAO/TAO_IDL/util/utl_scope.cpp +++ b/TAO/TAO_IDL/util/utl_scope.cpp @@ -1621,7 +1621,7 @@ UTL_Scope::lookup_by_name_local (Identifier *e, ACE_OS::strcmp (e->get_string (), "CORBA") == 0; // Iterate over this scope. - for (UTL_ScopeActiveIterator i (this, UTL_Scope::IK_both); + for (UTL_ScopeActiveIterator i (this, UTL_Scope::IK_decls); !i.is_done (); i.next ()) { |