diff options
| author | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-06-04 20:37:55 +0000 |
|---|---|---|
| committer | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-06-04 20:37:55 +0000 |
| commit | 059b2c61a5b992467f97c586b61c4b82f2885960 (patch) | |
| tree | 6e79ae15e8bdfb6f3af5f6c15468778d50e94545 | |
| parent | 734f85e3c282cdafcf1ef999aa8e24573216fb37 (diff) | |
| download | ATCD-059b2c61a5b992467f97c586b61c4b82f2885960.tar.gz | |
Fri Jun 04 15:25:38 1999 Irfan Pyarali <irfan@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog-99c | 13 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp | 12 |
2 files changed, 12 insertions, 13 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index cf41407eb65..a4441c40feb 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,3 +1,10 @@ +Fri Jun 04 15:25:38 1999 Irfan Pyarali <irfan@cs.wustl.edu> + + * TAO_IDL/be/be_visitor_interface/tie_si.cpp (visit_interface): + Fixed the generated code for _default_POA() for the tie classes. + If <poa_> is nil, simply delegate to the base class. Thanks to + Carlos for helping with this. + Fri Jun 4 14:40:48 1999 Carlos O'Ryan <coryan@cs.wustl.edu> * tao/ORB.cpp: @@ -6,13 +13,13 @@ Fri Jun 4 14:40:48 1999 Carlos O'Ryan <coryan@cs.wustl.edu> destruction (only at debug level >= 3) The ORB_Table singleton will destroy all ORBs that are still on the table at process shutdown. - The TAO_ORB_Core_instance() will return the first ORB on the ORB + The TAO_ORB_Core_instance() will return the first ORB on the ORB table, only if the table is empty it will create one. * tests/Param_Test/server.h: * tests/Param_Test/param_test_i.h: * tests/Param_Test/param_test_i.cpp: - It was using ORB_Core_instance() to shutdown the ORB, we keep an + It was using ORB_Core_instance() to shutdown the ORB, we keep an ORB pointer around to do the right thing. * utils/catior/catior.cpp: @@ -30,7 +37,7 @@ Fri Jun 4 13:35:29 1999 Jeff Parsons <parsons@cs.wustl.edu> Fri Jun 4 13:04:45 1999 Jeff Parsons <parsons@cs.wustl.edu> * TAO_IDL/util/utl_global.cpp: - Since the one 'official' IDL file that gave us + Since the one 'official' IDL file that gave us problems has been fixed, the default behavior of the IDL compiler for case-only spelling differences in identifiers sharing the same scope has been diff --git a/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp b/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp index 061af8f7d7d..a0483042519 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp @@ -157,17 +157,9 @@ be_visitor_interface_tie_si::visit_interface (be_interface *node) << fulltiename << "<T>::_default_POA (CORBA::Environment &env)" << be_nl << "{" << be_idt_nl << "if (!CORBA::is_nil (this->poa_.in ()))" << be_idt_nl - << "return PortableServer::POA::_duplicate (this->poa_.in ());" + << "return PortableServer::POA::_duplicate (this->poa_.in ());\n" << be_uidt_nl - << "else" << be_nl - << "{" << be_idt_nl - << "TAO_POA *poa = TAO_ORB_Core_instance ()->root_poa ();" << be_nl - << "PortableServer::POA_var result = poa->_this (env);" << be_nl - << "if (env.exception () != 0)" << be_idt_nl - << "return PortableServer::POA::_nil ();" << be_uidt_nl - << "else" << be_idt_nl - << "return result._retn ();" << be_uidt << be_uidt_nl - << "}" << be_uidt_nl + << "return this->" << node->local_name () << "::_default_POA (env);" << be_uidt_nl << "}\n\n"; if (node->traverse_inheritance_graph (be_visitor_interface_tie_si::method_helper, os) == -1) |