diff options
| author | gokhale <asgokhale@users.noreply.github.com> | 1998-04-20 21:52:06 +0000 |
|---|---|---|
| committer | gokhale <asgokhale@users.noreply.github.com> | 1998-04-20 21:52:06 +0000 |
| commit | ad8c27b118065ac753613efc42329ab72284a8d9 (patch) | |
| tree | 7f3a0c632e1ed0df9c4a5ae1e29b634ed128aa67 | |
| parent | 878496b1f7d89bf13d3ce3b25f234354efcbec56 (diff) | |
| download | ATCD-ad8c27b118065ac753613efc42329ab72284a8d9.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/ChangeLog-98c | 11 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_interface.cpp | 6 |
2 files changed, 12 insertions, 5 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index be2ba64e31e..9ebcdb2e76e 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,7 +1,14 @@ +Mon Apr 20 16:46:07 1998 Aniruddha Gokhale <gokhale@mambo.cs.wustl.edu> + + * TAO_IDL/be/be_visitor_interface.cpp: An ACE_NESTED_CLASS was + getting generated with a blank first argument for cases where the + interfaces were defined in the outermost scope. This is now fixed + by using a conditional "is_nested". + Mon Apr 20 13:23:30 1998 Carlos O'Ryan <coryan@cs.wustl.edu> - * tao/Server_Request.h: - * tao/Server_Request.cpp: + * tao/Server_Request.h: + * tao/Server_Request.cpp: We keep a flag to determine whether the exceptions stored with the set_exception() method are user exceptions or system exceptions. diff --git a/TAO/TAO_IDL/be/be_visitor_interface.cpp b/TAO/TAO_IDL/be/be_visitor_interface.cpp index 668ba528ae3..f1c4238d22a 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface.cpp @@ -1760,10 +1760,10 @@ int be_visitor_interface_collocated_ss::visit_interface (be_interface *node) os->incr_indent (); - if (node->defined_in ()) + if (node->is_nested ()) { be_decl* scope = - be_scope::narrow_from_scope (node->defined_in())->decl (); + be_scope::narrow_from_scope (node->defined_in ())->decl (); *os << ": ACE_NESTED_CLASS (" << scope->name () << "," @@ -1785,7 +1785,7 @@ int be_visitor_interface_collocated_ss::visit_interface (be_interface *node) { be_interface* parent = be_interface::narrow_from_decl (node->inherits()[i]); - if (parent->defined_in ()) + if (parent->is_nested ()) { be_decl* scope = be_scope::narrow_from_scope (parent->defined_in())->decl (); |