diff options
Diffstat (limited to 'TAO/tao/PortableServer')
9 files changed, 50 insertions, 101 deletions
diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.cpp b/TAO/tao/PortableServer/Active_Policy_Strategies.cpp index 866875aca19..c1981048df9 100644 --- a/TAO/tao/PortableServer/Active_Policy_Strategies.cpp +++ b/TAO/tao/PortableServer/Active_Policy_Strategies.cpp @@ -64,8 +64,7 @@ namespace TAO void Active_Policy_Strategies::update (Cached_Policies &policies, - ::TAO_Root_POA *poa - ) + ::TAO_Root_POA *poa) { this->thread_strategy_factory_ = ACE_Dynamic_Service<ThreadStrategyFactory>::instance ("ThreadStrategyFactory"); diff --git a/TAO/tao/PortableServer/POA.pidl b/TAO/tao/PortableServer/POA.pidl index e0060e76390..48cae64313f 100644 --- a/TAO/tao/PortableServer/POA.pidl +++ b/TAO/tao/PortableServer/POA.pidl @@ -106,7 +106,7 @@ module PortableServer exception AdapterAlreadyExists {}; exception AdapterNonExistent {}; exception InvalidPolicy {unsigned short index;}; -#if !defined (TAO_HAS_MINIMUM_POA) +#if !defined (TAO_HAS_MINIMUM_POA) && !defined (CORBA_E_COMPACT) exception NoServant {}; #endif exception ObjectAlreadyActive {}; diff --git a/TAO/tao/PortableServer/RequestProcessingStrategy.h b/TAO/tao/PortableServer/RequestProcessingStrategy.h index 2d515d52f87..4ce818c67b0 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategy.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategy.h @@ -52,69 +52,52 @@ namespace TAO public: RequestProcessingStrategy (void); - virtual void strategy_init( - TAO_Root_POA *poa - ); + virtual void strategy_init(TAO_Root_POA *poa); virtual void strategy_init( TAO_Root_POA *poa, - ::PortableServer::ServantRetentionPolicyValue - ); + ::PortableServer::ServantRetentionPolicyValue); virtual void strategy_cleanup(void); -#if (TAO_HAS_MINIMUM_POA == 0) +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) - virtual PortableServer::ServantManager_ptr get_servant_manager ( - void) - = 0; + virtual PortableServer::ServantManager_ptr get_servant_manager (void) = 0; virtual void set_servant_manager ( - PortableServer::ServantManager_ptr imgr - ) - = 0; + PortableServer::ServantManager_ptr imgr) = 0; - virtual void set_servant (PortableServer::Servant servant ) - = 0; + virtual void set_servant (PortableServer::Servant servant) = 0; -#endif /* TAO_HAS_MINIMUM_POA == 0 */ + virtual PortableServer::Servant get_servant (void) = 0; - virtual PortableServer::Servant get_servant (void) - = 0; +#endif /* TAO_HAS_MINIMUM_POA == 0 !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */ virtual TAO_SERVANT_LOCATION locate_servant ( const PortableServer::ObjectId &system_id, - PortableServer::Servant &servant - ) = 0; + PortableServer::Servant &servant) = 0; virtual PortableServer::Servant locate_servant ( const char *operation, const PortableServer::ObjectId &system_id, TAO::Portable_Server::Servant_Upcall &servant_upcall, TAO::Portable_Server::POA_Current_Impl &poa_current_impl, - bool &wait_occurred_restart_call - ) = 0; + bool &wait_occurred_restart_call) = 0; virtual void cleanup_servant ( PortableServer::Servant servant, - const PortableServer::ObjectId &user_id - ) = 0; + const PortableServer::ObjectId &user_id) = 0; virtual PortableServer::Servant system_id_to_servant ( - const PortableServer::ObjectId &system_id - ) = 0; + const PortableServer::ObjectId &system_id) = 0; virtual PortableServer::Servant id_to_servant ( - const PortableServer::ObjectId &id - ) - = 0; + const PortableServer::ObjectId &id) = 0; virtual void etherealize_objects (CORBA::Boolean etherealize_objects) = 0; virtual PortableServer::ObjectId *servant_to_id ( - PortableServer::Servant servant - ) - = 0; + PortableServer::Servant servant) = 0; virtual void post_invoke_servant_cleanup( const PortableServer::ObjectId &system_id, diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp index 4ee454e9b61..4778aa7db48 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp @@ -21,7 +21,7 @@ namespace TAO { } -#if (TAO_HAS_MINIMUM_POA == 0) +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::ServantManager_ptr RequestProcessingStrategyAOMOnly::get_servant_manager (void) @@ -43,14 +43,14 @@ namespace TAO throw PortableServer::POA::WrongPolicy (); } -#endif /* TAO_HAS_MINIMUM_POA == 0 */ - PortableServer::Servant RequestProcessingStrategyAOMOnly::get_servant (void) { throw PortableServer::POA::WrongPolicy (); } +#endif /* TAO_HAS_MINIMUM_POA == 0 !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */ + TAO_SERVANT_LOCATION RequestProcessingStrategyAOMOnly::locate_servant ( const PortableServer::ObjectId & system_id, diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h index 96d79641ce9..84c0cfce064 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h @@ -40,29 +40,23 @@ namespace TAO public: RequestProcessingStrategyAOMOnly (void); -#if (TAO_HAS_MINIMUM_POA == 0) +#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::ServantManager_ptr get_servant_manager (void); - void - set_servant_manager (PortableServer::ServantManager_ptr imgr - ); + void set_servant_manager (PortableServer::ServantManager_ptr imgr); - void - set_servant (PortableServer::Servant servant - ); + void set_servant (PortableServer::Servant servant); -#endif /* TAO_HAS_MINIMUM_POA == 0 */ + PortableServer::Servant get_servant (void); - PortableServer::Servant - get_servant (void); +#endif /* TAO_HAS_MINIMUM_POA == 0 !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */ virtual TAO_SERVANT_LOCATION locate_servant (const PortableServer::ObjectId &system_id, - PortableServer::Servant &servant - ); + PortableServer::Servant &servant); virtual PortableServer::Servant @@ -70,27 +64,22 @@ namespace TAO const PortableServer::ObjectId &system_id, TAO::Portable_Server::Servant_Upcall &servant_upcall, TAO::Portable_Server::POA_Current_Impl &poa_current_impl, - bool &wait_occurred_restart_call - ); + bool &wait_occurred_restart_call); virtual PortableServer::Servant system_id_to_servant ( - const PortableServer::ObjectId &system_id - ); + const PortableServer::ObjectId &system_id); virtual PortableServer::Servant id_to_servant ( - const PortableServer::ObjectId &id - ); + const PortableServer::ObjectId &id); virtual void cleanup_servant ( PortableServer::Servant servant, - const PortableServer::ObjectId &user_id - ); + const PortableServer::ObjectId &user_id); virtual void etherealize_objects (CORBA::Boolean etherealize_objects); virtual PortableServer::ObjectId *servant_to_id ( - PortableServer::Servant servant - ); + PortableServer::Servant servant); virtual void post_invoke_servant_cleanup( const PortableServer::ObjectId &system_id, diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp index 2b18dd7ff53..f773734e11b 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp @@ -57,8 +57,7 @@ namespace TAO void RequestProcessingStrategyDefaultServant::set_servant ( - PortableServer::Servant servant - ) + PortableServer::Servant servant) { // This operation registers the specified servant with the POA as // the default servant. This servant will be used for all requests @@ -113,8 +112,7 @@ namespace TAO const PortableServer::ObjectId & system_id, TAO::Portable_Server::Servant_Upcall &servant_upcall, TAO::Portable_Server::POA_Current_Impl &poa_current_impl, - bool & /*wait_occurred_restart_call*/ - ) + bool & /*wait_occurred_restart_call*/) { PortableServer::Servant servant = 0; @@ -182,8 +180,7 @@ namespace TAO void RequestProcessingStrategyDefaultServant::cleanup_servant ( PortableServer::Servant servant, - const PortableServer::ObjectId &user_id - ) + const PortableServer::ObjectId &user_id) { if (servant) { @@ -211,8 +208,7 @@ namespace TAO PortableServer::ObjectId * RequestProcessingStrategyDefaultServant::servant_to_id ( - PortableServer::Servant servant - ) + PortableServer::Servant servant) { PortableServer::Servant default_servant = this->default_servant_.in (); diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h index f536a91a970..6976659e156 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h @@ -43,50 +43,39 @@ namespace TAO virtual void strategy_cleanup(void); - PortableServer::ServantManager_ptr - get_servant_manager (void); + PortableServer::ServantManager_ptr get_servant_manager (void); - void set_servant_manager ( - PortableServer::ServantManager_ptr imgr - ); + void set_servant_manager (PortableServer::ServantManager_ptr imgr); PortableServer::Servant get_servant (void); - void set_servant ( - PortableServer::Servant servant - ); + void set_servant (PortableServer::Servant servant); virtual TAO_SERVANT_LOCATION locate_servant ( const PortableServer::ObjectId &system_id, - PortableServer::Servant &servant - ); + PortableServer::Servant &servant); virtual PortableServer::Servant locate_servant ( const char *operation, const PortableServer::ObjectId &system_id, TAO::Portable_Server::Servant_Upcall &servant_upcall, TAO::Portable_Server::POA_Current_Impl &poa_current_impl, - bool &wait_occurred_restart_call - ); + bool &wait_occurred_restart_call); virtual PortableServer::Servant system_id_to_servant ( - const PortableServer::ObjectId &system_id - ); + const PortableServer::ObjectId &system_id); virtual PortableServer::Servant id_to_servant ( - const PortableServer::ObjectId &id - ); + const PortableServer::ObjectId &id); virtual void cleanup_servant ( PortableServer::Servant servant, - const PortableServer::ObjectId &user_id - ); + const PortableServer::ObjectId &user_id); virtual void etherealize_objects (CORBA::Boolean etherealize_objects); virtual PortableServer::ObjectId *servant_to_id ( - PortableServer::Servant servant - ); + PortableServer::Servant servant); virtual void post_invoke_servant_cleanup( const PortableServer::ObjectId &system_id, diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h index 7b4504180bf..0c170efd25b 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h @@ -42,26 +42,22 @@ namespace TAO PortableServer::ServantManager_ptr get_servant_manager (void); - void set_servant_manager (PortableServer::ServantManager_ptr imgr - ); + void set_servant_manager (PortableServer::ServantManager_ptr imgr); virtual TAO_SERVANT_LOCATION locate_servant ( const PortableServer::ObjectId &system_id, - PortableServer::Servant &servant - ); + PortableServer::Servant &servant); virtual PortableServer::Servant locate_servant ( const char *operation, const PortableServer::ObjectId &system_id, TAO::Portable_Server::Servant_Upcall &servant_upcall, TAO::Portable_Server::POA_Current_Impl &poa_current_impl, - bool &wait_occurred_restart_call - ); + bool &wait_occurred_restart_call); virtual void cleanup_servant ( PortableServer::Servant servant, - const PortableServer::ObjectId &user_id - ); + const PortableServer::ObjectId &user_id); virtual void etherealize_objects (CORBA::Boolean etherealize_objects); @@ -71,13 +67,11 @@ namespace TAO private: PortableServer::Servant incarnate_servant ( - const PortableServer::ObjectId& object_id - ); + const PortableServer::ObjectId& object_id); void etherealize_servant (const PortableServer::ObjectId& object_id, PortableServer::Servant servant, - CORBA::Boolean cleanup_in_progress - ); + CORBA::Boolean cleanup_in_progress); private: PortableServer::ServantActivator_var servant_activator_; diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h index 8a6c09546a1..7b12941991f 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h @@ -42,8 +42,7 @@ namespace TAO void set_servant (PortableServer::Servant servant); void validate_servant_manager ( - PortableServer::ServantManager_ptr servant_manager - ); + PortableServer::ServantManager_ptr servant_manager); virtual PortableServer::Servant system_id_to_servant ( const PortableServer::ObjectId &system_id); |