diff options
Diffstat (limited to 'TAO/orbsvcs')
8 files changed, 42 insertions, 42 deletions
diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp index 4fc119dfc39..2cd8117b443 100644 --- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp +++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp @@ -68,7 +68,7 @@ Server_IORInterceptor::components_established ( void Server_IORInterceptor::adapter_manager_state_changed ( - PortableInterceptor::AdapterManagerId, + const char *, PortableInterceptor::AdapterState ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h index a77551ad136..da243325d05 100644 --- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h +++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h @@ -55,7 +55,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); virtual void adapter_manager_state_changed ( - PortableInterceptor::AdapterManagerId id, + const char * id, PortableInterceptor::AdapterState state ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp index 6af1cad1b42..3f555d17a5c 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp @@ -95,7 +95,7 @@ TAO_LB_IORInterceptor::components_established ( void TAO_LB_IORInterceptor::adapter_manager_state_changed ( - PortableInterceptor::AdapterManagerId, + const char *, PortableInterceptor::AdapterState state ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h index ca4b6f7ea01..6b93c951912 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h @@ -92,7 +92,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); virtual void adapter_manager_state_changed ( - PortableInterceptor::AdapterManagerId id, + const char * id, PortableInterceptor::AdapterState state ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (( diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp index 829ca0cdef9..804e235f797 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp @@ -38,8 +38,8 @@ TAO_GOA::create_id_for_reference (CORBA::Object_ptr the_ref ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - PortableServer::ObjectId_var obj_id = this->reference_to_id (obj_ref.in () - ACE_ENV_ARG_PARAMETER); + PortableServer::ObjectId_var obj_id = + this->reference_to_id (obj_ref.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Associate the object reference with the group reference. @@ -102,23 +102,23 @@ TAO_GOA::disassociate_reference_with_id (CORBA::Object_ptr ref, TAO_GOA::TAO_GOA (const TAO_Root_POA::String &name, - TAO_POA_Manager &poa_manager, - const TAO_POA_Policy_Set &policies, - TAO_Root_POA *parent, - ACE_Lock &lock, - TAO_SYNCH_MUTEX &thread_lock, - TAO_ORB_Core &orb_core, - TAO_Object_Adapter *object_adapter - ACE_ENV_ARG_DECL) + PortableServer::POAManager_ptr poa_manager, + const TAO_POA_Policy_Set &policies, + TAO_Root_POA *parent, + ACE_Lock &lock, + TAO_SYNCH_MUTEX &thread_lock, + TAO_ORB_Core &orb_core, + TAO_Object_Adapter *object_adapter + ACE_ENV_ARG_DECL) : TAO_Regular_POA (name, - poa_manager, - policies, - parent, - lock, - thread_lock, - orb_core, - object_adapter - ACE_ENV_ARG_PARAMETER) + poa_manager, + policies, + parent, + lock, + thread_lock, + orb_core, + object_adapter + ACE_ENV_ARG_PARAMETER) { } @@ -128,27 +128,27 @@ TAO_GOA::~TAO_GOA (void) TAO_Root_POA * TAO_GOA::new_POA (const String &name, - TAO_POA_Manager &poa_manager, - const TAO_POA_Policy_Set &policies, - TAO_Root_POA *parent, - ACE_Lock &lock, - TAO_SYNCH_MUTEX &thread_lock, - TAO_ORB_Core &orb_core, - TAO_Object_Adapter *object_adapter - ACE_ENV_ARG_DECL) + PortableServer::POAManager_ptr poa_manager, + const TAO_POA_Policy_Set &policies, + TAO_Root_POA *parent, + ACE_Lock &lock, + TAO_SYNCH_MUTEX &thread_lock, + TAO_ORB_Core &orb_core, + TAO_Object_Adapter *object_adapter + ACE_ENV_ARG_DECL) { TAO_GOA *poa = 0; ACE_NEW_THROW_EX (poa, TAO_GOA (name, - poa_manager, - policies, - parent, - lock, - thread_lock, - orb_core, - object_adapter - ACE_ENV_ARG_PARAMETER), + poa_manager, + policies, + parent, + lock, + thread_lock, + orb_core, + object_adapter + ACE_ENV_ARG_PARAMETER), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h index 12af8d574a5..d5bbdeb04dd 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h @@ -264,7 +264,7 @@ public: // End standard POA interface methods. TAO_GOA (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, @@ -282,7 +282,7 @@ protected: /// Template method for creating new POA's of this type. virtual 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, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp index 1c2b3a94b21..4b3504795e2 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp @@ -15,7 +15,7 @@ TAO_PG_Servant_Dispatcher::~TAO_PG_Servant_Dispatcher (void) TAO_Root_POA * TAO_PG_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, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h index c8c80d87a7f..a5718c240cc 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h @@ -57,7 +57,7 @@ public: /// Factory method for creating new POA's. 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, |