diff options
Diffstat (limited to 'TAO/tao/CSD_Framework')
| -rw-r--r-- | TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp | 4 | ||||
| -rw-r--r-- | TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h | 2 | ||||
| -rw-r--r-- | TAO/tao/CSD_Framework/CSD_POA.cpp | 4 | ||||
| -rw-r--r-- | TAO/tao/CSD_Framework/CSD_POA.h | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp index 7fa1a03f257..72b8028cd94 100644 --- a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp +++ b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp @@ -19,14 +19,14 @@ TAO_CSD_Default_Servant_Dispatcher::~TAO_CSD_Default_Servant_Dispatcher (void) TAO_Root_POA * TAO_CSD_Default_Servant_Dispatcher::create_Root_POA (const ACE_CString &name, - TAO_POA_Manager &poa_manager, + PortableServer::POAManager_ptr poa_manager, const TAO_POA_Policy_Set &policies, ACE_Lock &lock, TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter ACE_ENV_ARG_DECL) -{ + { TAO_CSD_POA *poa = 0; ACE_NEW_THROW_EX (poa, diff --git a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h index ed78621d075..1d041331e99 100644 --- a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h +++ b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h @@ -38,7 +38,7 @@ public: /// Factory method for creating new CSD Root POA. virtual TAO_Root_POA *create_Root_POA (const ACE_CString &name, - TAO_POA_Manager &poa_manager, + PortableServer::POAManager_ptr poa_manager, const TAO_POA_Policy_Set &policies, ACE_Lock &lock, TAO_SYNCH_MUTEX &thread_lock, diff --git a/TAO/tao/CSD_Framework/CSD_POA.cpp b/TAO/tao/CSD_Framework/CSD_POA.cpp index cd63c5d7375..f3cc8e605f5 100644 --- a/TAO/tao/CSD_Framework/CSD_POA.cpp +++ b/TAO/tao/CSD_Framework/CSD_POA.cpp @@ -18,7 +18,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Implementation skeleton constructor TAO_CSD_POA::TAO_CSD_POA (const String &name, - TAO_POA_Manager &poa_manager, + PortableServer::POAManager_ptr poa_manager, const TAO_POA_Policy_Set &policies, TAO_Root_POA *parent, ACE_Lock &lock, @@ -66,7 +66,7 @@ void TAO_CSD_POA::set_csd_strategy ( TAO_Root_POA * TAO_CSD_POA::new_POA (const String &name, - TAO_POA_Manager &poa_manager, + PortableServer::POAManager_ptr poa_manager, const TAO_POA_Policy_Set &policies, TAO_Root_POA *parent, ACE_Lock &lock, diff --git a/TAO/tao/CSD_Framework/CSD_POA.h b/TAO/tao/CSD_Framework/CSD_POA.h index 7bf2c338e0d..bcbf2e0495f 100644 --- a/TAO/tao/CSD_Framework/CSD_POA.h +++ b/TAO/tao/CSD_Framework/CSD_POA.h @@ -40,7 +40,7 @@ class TAO_CSD_FW_Export TAO_CSD_POA public: //Constructor TAO_CSD_POA (const String &name, - TAO_POA_Manager &poa_manager, + PortableServer::POAManager_ptr poa_manager, const TAO_POA_Policy_Set &policies, TAO_Root_POA *parent, ACE_Lock &lock, @@ -80,7 +80,7 @@ public: ///Method for creating new CSD POA. TAO_Root_POA * new_POA (const String &name, - TAO_POA_Manager &poa_manager, + PortableServer::POAManager_ptr poa_manager, const TAO_POA_Policy_Set &policies, TAO_Root_POA *parent, ACE_Lock &lock, |