diff options
| author | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-01-19 19:36:06 +0000 |
|---|---|---|
| committer | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-01-19 19:36:06 +0000 |
| commit | e4b072a65e5e31997a28c529974026ac4fbd7ec2 (patch) | |
| tree | d31896ff638179600679cc446d7944ae6a5c5649 | |
| parent | 460279ae76a5462897352ccf44ecbeb1a8f6f1be (diff) | |
| download | ATCD-e4b072a65e5e31997a28c529974026ac4fbd7ec2.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/tao/poa.cpp | 10 | ||||
| -rw-r--r-- | TAO/tao/poa.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/TAO/tao/poa.cpp b/TAO/tao/poa.cpp index 33e2499258f..e6f0fe85130 100644 --- a/TAO/tao/poa.cpp +++ b/TAO/tao/poa.cpp @@ -12,13 +12,15 @@ // auto_ptr class #include "ace/Auto_Ptr.h" -template <class STUB, class COLLOCATED_SKELETON, class IMPLEMENTATION> +template <class STUB, class IMPLEMENTATION> IMPLEMENTATION * stub_to_impl (STUB stub) { - COLLOCATED_SKELETON *collocated = ACE_dynamic_cast (COLLOCATED_SKELETON *, stub); + PortableServer::Servant servant = stub->_servant (); + if (servant == 0) + return 0; - return ACE_dynamic_cast (IMPLEMENTATION *, collocated->_get_servant ()); + return ACE_dynamic_cast (IMPLEMENTATION *, servant); } TAO_Thread_Policy::TAO_Thread_Policy (PortableServer::ThreadPolicyValue value) @@ -626,7 +628,6 @@ TAO_POA::create_POA (const char *adapter_name, else { poa_manager_impl = stub_to_impl<PortableServer::POAManager_ptr, - POA_PortableServer::_tao_collocated_POAManager, TAO_POA_Manager> (poa_manager); } @@ -2231,7 +2232,6 @@ TAO_Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent, CORBA::Environment &env) { TAO_POA *parent_impl = stub_to_impl<PortableServer::POA_ptr, - POA_PortableServer::_tao_collocated_POA, TAO_POA> (parent); return this->unknown_adapter_i (parent_impl, diff --git a/TAO/tao/poa.h b/TAO/tao/poa.h index 130669fb8b9..4d44825e756 100644 --- a/TAO/tao/poa.h +++ b/TAO/tao/poa.h @@ -52,7 +52,7 @@ class TAO_POA; class TAO_POA_Manager; -template <class STUB, class COLOCATED_SKELETON, class IMPLEMENTATION> +template <class STUB, class IMPLEMENTATION> IMPLEMENTATION *stub_to_impl (STUB stub); class TAO_Thread_Policy : public POA_PortableServer::ThreadPolicy |