diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-04-23 16:18:36 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-04-23 16:18:36 +0000 |
| commit | 3894eafd0da92739c867b2705077553ca051931d (patch) | |
| tree | cbf13c23255d6640884ed518d294ba6197c17182 | |
| parent | dd7864cc49090bd9988ac1004ab9cfbddad56e61 (diff) | |
| download | ATCD-3894eafd0da92739c867b2705077553ca051931d.tar.gz | |
ChangeLogTag: Thu Apr 23 16:09:54 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 14 | ||||
| -rw-r--r-- | TAO/TAO_IDL/ast/ast_interface.cpp | 8 | ||||
| -rw-r--r-- | TAO/TAO_IDL/fe/idl.yy | 5 | ||||
| -rw-r--r-- | TAO/TAO_IDL/fe/y.tab.cpp | 5 |
4 files changed, 22 insertions, 10 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 24dc4dca632..178099a4074 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,17 @@ +Thu Apr 23 16:09:54 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu> + + * TAO_IDL/ast/ast_interface.cpp: + * TAO_IDL/fe/y.tab.cpp: + * TAO_IDL/fe/idl.yy: + + Further tweaks to the fix of + + Wed Apr 22 17:59:18 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu> + + to correct a problem uncovered by processing + RTPortableServer.pidl. Thanks to Will Otte + <wotte at dre dot vanderbilt.edu> for reporting the problem. + Thu Apr 23 11:10:37 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * orbsvcs/Notify_Service/Notify_Service.{h,cpp}: diff --git a/TAO/TAO_IDL/ast/ast_interface.cpp b/TAO/TAO_IDL/ast/ast_interface.cpp index d3839adae34..33e9ba0f55c 100644 --- a/TAO/TAO_IDL/ast/ast_interface.cpp +++ b/TAO/TAO_IDL/ast/ast_interface.cpp @@ -1139,14 +1139,6 @@ AST_Interface::fwd_redefinition_helper (AST_Interface *&i, idl_global->err ()->redef_error (i->full_name (), d->full_name ()); } - - AST_InterfaceFwd *fwd = - AST_InterfaceFwd::narrow_from_decl (d); - - if (fwd != 0) - { - fwd->set_as_defined (); - } } // If it is a forward declared interface.. else if (!fd->is_defined ()) diff --git a/TAO/TAO_IDL/fe/idl.yy b/TAO/TAO_IDL/fe/idl.yy index 9e001e752ec..adbaccf081d 100644 --- a/TAO/TAO_IDL/fe/idl.yy +++ b/TAO/TAO_IDL/fe/idl.yy @@ -4261,8 +4261,11 @@ param_type_spec } if (elem_nt == AST_Decl::NT_interface + || elem_nt == AST_Decl::NT_interface_fwd || elem_nt == AST_Decl::NT_valuetype - || elem_nt == AST_Decl::NT_component) + || elem_nt == AST_Decl::NT_valuetype_fwd + || elem_nt == AST_Decl::NT_component + || elem_nt == AST_Decl::NT_component_fwd) { can_be_undefined = true; } diff --git a/TAO/TAO_IDL/fe/y.tab.cpp b/TAO/TAO_IDL/fe/y.tab.cpp index 2636562d6fc..a71d990eeeb 100644 --- a/TAO/TAO_IDL/fe/y.tab.cpp +++ b/TAO/TAO_IDL/fe/y.tab.cpp @@ -6425,8 +6425,11 @@ tao_yyreduce: } if (elem_nt == AST_Decl::NT_interface + || elem_nt == AST_Decl::NT_interface_fwd || elem_nt == AST_Decl::NT_valuetype - || elem_nt == AST_Decl::NT_component) + || elem_nt == AST_Decl::NT_valuetype_fwd + || elem_nt == AST_Decl::NT_component + || elem_nt == AST_Decl::NT_component_fwd) { can_be_undefined = true; } |