diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2003-03-07 15:50:16 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2003-03-07 15:50:16 +0000 |
| commit | f5b619e3552d203b2050d232785335c674b1c94e (patch) | |
| tree | dbca5c6082b22f02095bc6a02973889e7c704269 | |
| parent | 4f38713c61a001552798392e8e7d62b1e9fd3d35 (diff) | |
| download | ATCD-f5b619e3552d203b2050d232785335c674b1c94e.tar.gz | |
ChangeLogTag:Fri Mar 07 09:49:35 2003 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
| -rw-r--r-- | TAO/TAO_IDL/be/be_codegen.cpp | 2 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp | 6 | ||||
| -rw-r--r-- | TAO/tao/ChangeLog | 10 |
3 files changed, 14 insertions, 4 deletions
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp index 33154c77d9b..60f61b7d43f 100644 --- a/TAO/TAO_IDL/be/be_codegen.cpp +++ b/TAO/TAO_IDL/be/be_codegen.cpp @@ -709,6 +709,8 @@ TAO_CodeGen::start_server_skeletons (const char *fname) this->gen_standard_include (this->server_skeletons_, "tao/ORB_Core.h"); this->gen_standard_include (this->server_skeletons_, + "tao/Profile.h"); + this->gen_standard_include (this->server_skeletons_, "tao/Stub.h"); this->gen_standard_include (this->server_skeletons_, "tao/IFR_Client_Adapter.h"); diff --git a/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp index d2c0e74a7ee..207b8451b14 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp @@ -128,7 +128,7 @@ be_visitor_operation_thru_poa_proxy_impl_ss::visit_operation ( } } - *os << be_nl + *os << be_nl << "TAO_Object_Adapter::Servant_Upcall servant_upcall (" << be_idt << be_idt_nl << "_collocated_tao_target_->_stubobj ()" @@ -137,9 +137,9 @@ be_visitor_operation_thru_poa_proxy_impl_ss::visit_operation ( << ");" << be_uidt_nl << "CORBA::Object_var forward_to;" << be_nl << "servant_upcall.prepare_for_upcall (" << be_idt << be_idt_nl - << "_collocated_tao_target_->_object_key ()," << be_nl + << "_collocated_tao_target_->_stubobj ()->profile_in_use ()->object_key ()," << be_nl << "\""; - + // Check if we are an attribute node in disguise. if (this->ctx_->attribute ()) { diff --git a/TAO/tao/ChangeLog b/TAO/tao/ChangeLog index 97a43c108b7..46c2c9d1ac9 100644 --- a/TAO/tao/ChangeLog +++ b/TAO/tao/ChangeLog @@ -1,5 +1,13 @@ -Mon Mar 03 14:07:10 2003 Balachandran Natarajan <bala@cs.wustl.edu> +Fri Mar 07 09:49:35 2003 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> + * TAO_IDL/be/be_codegen.cpp: + * TAO_IDL/be_visitor_operation/thru_poa_proxy_impl_ss.cpp: Changed + the generated code to call object_key () on the stub object + within the CORBA::Object instead of callong _object_key (). + +Mon Mar 03 14:07:10 2003 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> + + This is just a temporary checkin to test it on another box. * tao/IOP_Codec.pidl: * tao/IOP_IOR.pidl: New files. |