diff options
Diffstat (limited to 'TAO/tao/PortableServer/POA.h')
| -rw-r--r-- | TAO/tao/PortableServer/POA.h | 256 |
1 files changed, 128 insertions, 128 deletions
diff --git a/TAO/tao/PortableServer/POA.h b/TAO/tao/PortableServer/POA.h index a72790868e3..7558af8eac7 100644 --- a/TAO/tao/PortableServer/POA.h +++ b/TAO/tao/PortableServer/POA.h @@ -150,170 +150,170 @@ public: PortableServer::POA_ptr create_POA (const char *adapter_name, PortableServer::POAManager_ptr poa_manager, - const CORBA::PolicyList &policies, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + const CORBA::PolicyList &policies + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterAlreadyExists, PortableServer::POA::InvalidPolicy)); PortableServer::POA_ptr find_POA (const char *adapter_name, - CORBA::Boolean activate_it, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + CORBA::Boolean activate_it + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterNonExistent)); void destroy (CORBA::Boolean etherealize_objects, - CORBA::Boolean wait_for_completion, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + CORBA::Boolean wait_for_completion + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); #if (TAO_HAS_MINIMUM_POA == 0) - PortableServer::ThreadPolicy_ptr create_thread_policy (PortableServer::ThreadPolicyValue value, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + PortableServer::ThreadPolicy_ptr create_thread_policy (PortableServer::ThreadPolicyValue value + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); #endif /* TAO_HAS_MINIMUM_POA == 0 */ - PortableServer::LifespanPolicy_ptr create_lifespan_policy (PortableServer::LifespanPolicyValue value, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + PortableServer::LifespanPolicy_ptr create_lifespan_policy (PortableServer::LifespanPolicyValue value + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); #if (TAO_HAS_MINIMUM_POA == 0) - PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); #endif /* TAO_HAS_MINIMUM_POA == 0 */ - char * the_name (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + char * the_name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POA_ptr the_parent (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + PortableServer::POA_ptr the_parent (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POAList *the_children (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + PortableServer::POAList *the_children (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POAManager_ptr the_POAManager (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + PortableServer::POAManager_ptr the_POAManager (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); #if (TAO_HAS_MINIMUM_POA == 0) - PortableServer::AdapterActivator_ptr the_activator (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + PortableServer::AdapterActivator_ptr the_activator (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void the_activator (PortableServer::AdapterActivator_ptr adapter_activator, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + void the_activator (PortableServer::AdapterActivator_ptr adapter_activator + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::ServantManager_ptr get_servant_manager (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + PortableServer::ServantManager_ptr get_servant_manager (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); - void set_servant_manager (PortableServer::ServantManager_ptr imgr, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + void set_servant_manager (PortableServer::ServantManager_ptr imgr + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); - PortableServer::Servant get_servant (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + PortableServer::Servant get_servant (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::NoServant, PortableServer::POA::WrongPolicy)); - void set_servant (PortableServer::Servant servant, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + void set_servant (PortableServer::Servant servant + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); #endif /* TAO_HAS_MINIMUM_POA == 0 */ - PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::WrongPolicy)); void activate_object_with_id (const PortableServer::ObjectId &id, - PortableServer::Servant p_servant, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + PortableServer::Servant p_servant + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::ObjectAlreadyActive, PortableServer::POA::WrongPolicy)); - void deactivate_object (const PortableServer::ObjectId &oid, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + void deactivate_object (const PortableServer::ObjectId &oid + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)); - CORBA::Object_ptr create_reference (const char *intf, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + CORBA::Object_ptr create_reference (const char *intf + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); CORBA::Object_ptr create_reference_with_id (const PortableServer::ObjectId &oid, - const char *intf, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + const char *intf + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); - PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)); - CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)); - PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongAdapter, PortableServer::POA::WrongPolicy)); - PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongAdapter, PortableServer::POA::WrongPolicy)); - PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)); - CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)); - CORBA::OctetSeq *id (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + CORBA::OctetSeq *id (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Accessor for POA policies. @@ -322,8 +322,8 @@ public: /// Accessor for cached POA policies. TAO_POA_Cached_Policies &cached_policies (void); - virtual CORBA::PolicyList *client_exposed_policies (CORBA::Short object_priority, - CORBA_Environment &ACE_TRY_ENV); + virtual CORBA::PolicyList *client_exposed_policies (CORBA::Short object_priority + TAO_ENV_ARG_DECL); // This method gives the policies that are exposed to the client. // These policies are shipped within the IOR. @@ -347,8 +347,8 @@ public: ACE_Lock &lock, TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, - TAO_Object_Adapter *object_adapter, - CORBA_Environment &ACE_TRY_ENV); + TAO_Object_Adapter *object_adapter + TAO_ENV_ARG_DECL); virtual ~TAO_POA (void); @@ -368,8 +368,8 @@ public: const TAO_Object_Adapter::poa_name &system_name (void) const; static void check_for_valid_wait_for_completions (const TAO_ORB_Core &orb_core, - CORBA::Boolean wait_for_completion, - CORBA::Environment &ACE_TRY_ENV); + CORBA::Boolean wait_for_completion + TAO_ENV_ARG_DECL); TAO_ORB_Core &orb_core (void) const; // ORB Core for POA. @@ -383,8 +383,8 @@ public: TAO_Stub* key_to_stub (const TAO_ObjectKey &key, const char *type_id, - CORBA::Short priority, - CORBA_Environment &ACE_TRY_ENV); + CORBA::Short priority + TAO_ENV_ARG_DECL); // Create the correct stub, properly initialized with the attributes // and policies attached to the current POA. @@ -405,59 +405,59 @@ protected: ACE_Lock &lock, TAO_SYNCH_MUTEX &thread_lock, TAO_ORB_Core &orb_core, - TAO_Object_Adapter *object_adapter, - CORBA_Environment &ACE_TRY_ENV); + TAO_Object_Adapter *object_adapter + TAO_ENV_ARG_DECL); PortableServer::POA_ptr create_POA_i (const char *adapter_name, PortableServer::POAManager_ptr poa_manager, - const CORBA::PolicyList &policies, - CORBA_Environment &ACE_TRY_ENV) + const CORBA::PolicyList &policies + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterAlreadyExists, PortableServer::POA::InvalidPolicy)); TAO_POA *create_POA_i (const String &adapter_name, TAO_POA_Manager &poa_manager, - const TAO_POA_Policy_Set &policies, - CORBA_Environment &ACE_TRY_ENV) + const TAO_POA_Policy_Set &policies + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterAlreadyExists, PortableServer::POA::InvalidPolicy)); TAO_POA *find_POA_i (const ACE_CString &child_name, - CORBA::Boolean activate_it, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Boolean activate_it + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::AdapterNonExistent)); void destroy_i (CORBA::Boolean etherealize_objects, - CORBA::Boolean wait_for_completion, - CORBA_Environment &ACE_TRY_ENV) + CORBA::Boolean wait_for_completion + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - void complete_destruction_i (CORBA::Environment &ACE_TRY_ENV); + void complete_destruction_i (TAO_ENV_SINGLE_ARG_DECL); - PortableServer::POAList *the_children_i (CORBA::Environment &ACE_TRY_ENV) + PortableServer::POAList *the_children_i (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); #if (TAO_HAS_MINIMUM_POA == 0) - PortableServer::ServantManager_ptr get_servant_manager_i (CORBA_Environment &ACE_TRY_ENV) + PortableServer::ServantManager_ptr get_servant_manager_i (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); - void set_servant_manager_i (PortableServer::ServantManager_ptr imgr, - CORBA_Environment &ACE_TRY_ENV) + void set_servant_manager_i (PortableServer::ServantManager_ptr imgr + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); - PortableServer::Servant get_servant_i (CORBA_Environment &ACE_TRY_ENV) + PortableServer::Servant get_servant_i (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::NoServant, PortableServer::POA::WrongPolicy)); - void set_servant_i (PortableServer::Servant servant, - CORBA_Environment &ACE_TRY_ENV) + void set_servant_i (PortableServer::Servant servant + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); @@ -468,7 +468,7 @@ protected: // #if (TAO_HAS_MINIMUM_CORBA == 0) - void imr_notify_startup (CORBA_Environment &ACE_TRY_ENV); + void imr_notify_startup (TAO_ENV_SINGLE_ARG_DECL); // ImplRepo helper method, notify the ImplRepo on startup void imr_notify_shutdown (void); @@ -480,23 +480,23 @@ protected: const char *type_id, TAO_ServantBase *servant, CORBA::Boolean collocated, - CORBA::Short priority, - CORBA_Environment &ACE_TRY_ENV); + CORBA::Short priority + TAO_ENV_ARG_DECL); // Wrapper for the ORB's key_to_object that will alter the object pointer // if the ImplRepo is used. virtual TAO_Stub* key_to_stub_i (const TAO_ObjectKey &key, const char *type_id, - CORBA::Short priority, - CORBA_Environment &ACE_TRY_ENV); + CORBA::Short priority + TAO_ENV_ARG_DECL); // Like key_to_stub() but assume that the ORB is not shutting down. TAO_Stub *create_stub_object (const TAO_ObjectKey &object_key, const char *type_id, CORBA::PolicyList *policy_list, TAO_Acceptor_Filter *filter, - TAO_Acceptor_Registry &acceptor_registry, - CORBA::Environment &ACE_TRY_ENV); + TAO_Acceptor_Registry &acceptor_registry + TAO_ENV_ARG_DECL); int is_servant_in_map (PortableServer::Servant servant); @@ -505,90 +505,90 @@ protected: int &priorities_match); PortableServer::ObjectId *activate_object_i (PortableServer::Servant p_servant, - CORBA::Short priority, - CORBA_Environment &ACE_TRY_ENV) + CORBA::Short priority + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::WrongPolicy)); void activate_object_with_id_i (const PortableServer::ObjectId &id, PortableServer::Servant p_servant, - CORBA::Short priority, - CORBA_Environment &ACE_TRY_ENV) + CORBA::Short priority + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::ObjectAlreadyActive, PortableServer::POA::WrongPolicy)); - void deactivate_all_objects_i (CORBA::Boolean etherealize_objects, - CORBA::Environment &ACE_TRY_ENV) + void deactivate_all_objects_i (CORBA::Boolean etherealize_objects + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); void deactivate_all_objects_i (CORBA::Boolean etherealize_objects, - CORBA::Boolean wait_for_completion, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Boolean wait_for_completion + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); - void wait_for_completions (CORBA::Boolean wait_for_completion, - CORBA::Environment &ACE_TRY_ENV); + void wait_for_completions (CORBA::Boolean wait_for_completion + TAO_ENV_ARG_DECL); - void check_poa_manager_state (CORBA::Environment &ACE_TRY_ENV); + void check_poa_manager_state (TAO_ENV_SINGLE_ARG_DECL); - void deactivate_object_i (const PortableServer::ObjectId &oid, - CORBA_Environment &ACE_TRY_ENV) + void deactivate_object_i (const PortableServer::ObjectId &oid + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)); - void cleanup_servant (TAO_Active_Object_Map::Map_Entry *active_object_map_entry, - CORBA::Environment &ACE_TRY_ENV); + void cleanup_servant (TAO_Active_Object_Map::Map_Entry *active_object_map_entry + TAO_ENV_ARG_DECL); - void deactivate_map_entry (TAO_Active_Object_Map::Map_Entry *active_object_map_entry, - CORBA::Environment &ACE_TRY_ENV); + void deactivate_map_entry (TAO_Active_Object_Map::Map_Entry *active_object_map_entry + TAO_ENV_ARG_DECL); CORBA::Object_ptr create_reference_i (const char *intf, - CORBA::Short priority, - CORBA_Environment &ACE_TRY_ENV) + CORBA::Short priority + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); CORBA::Object_ptr create_reference_with_id_i (const PortableServer::ObjectId &oid, const char *intf, - CORBA::Short priority, - CORBA_Environment &ACE_TRY_ENV) + CORBA::Short priority + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)); - PortableServer::ObjectId *servant_to_id_i (PortableServer::Servant servant, - CORBA_Environment &ACE_TRY_ENV) + PortableServer::ObjectId *servant_to_id_i (PortableServer::Servant servant + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)); PortableServer::ObjectId *servant_to_system_id (PortableServer::Servant p_servant, - CORBA::Short &priority, - CORBA_Environment &ACE_TRY_ENV) + CORBA::Short &priority + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)); PortableServer::ObjectId *servant_to_system_id_i (PortableServer::Servant p_servant, - CORBA::Short &priority, - CORBA_Environment &ACE_TRY_ENV) + CORBA::Short &priority + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantNotActive, PortableServer::POA::WrongPolicy)); - PortableServer::Servant id_to_servant_i (const PortableServer::ObjectId &oid, - CORBA_Environment &ACE_TRY_ENV) + PortableServer::Servant id_to_servant_i (const PortableServer::ObjectId &oid + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)); - CORBA::Object_ptr id_to_reference_i (const PortableServer::ObjectId &oid, - CORBA_Environment &ACE_TRY_ENV) + CORBA::Object_ptr id_to_reference_i (const PortableServer::ObjectId &oid + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ObjectNotActive, PortableServer::POA::WrongPolicy)); @@ -620,14 +620,14 @@ protected: protected: TAO_SERVANT_LOCATION locate_servant_i (const PortableServer::ObjectId &id, - PortableServer::Servant &servant, - CORBA_Environment &ACE_TRY_ENV); + PortableServer::Servant &servant + TAO_ENV_ARG_DECL); PortableServer::Servant locate_servant_i (const char *operation, const PortableServer::ObjectId &id, TAO_Object_Adapter::Servant_Upcall &servant_upcall, - TAO_POA_Current_Impl &poa_current_impl, - CORBA_Environment &ACE_TRY_ENV); + TAO_POA_Current_Impl &poa_current_impl + TAO_ENV_ARG_DECL); const TAO_Creation_Time &creation_time (void); @@ -752,8 +752,8 @@ protected: class TAO_PortableServer_Export TAO_POA_Guard { public: - TAO_POA_Guard (TAO_POA &poa, - CORBA::Environment &ACE_TRY_ENV, + TAO_POA_Guard (TAO_POA &poa + TAO_ENV_ARG_DECL, int check_for_destruction = 1); private: @@ -769,8 +769,8 @@ public: TAO_Adapter_Activator (PortableServer::POAManager_ptr poa_manager); CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent, - const char *name, - CORBA_Environment &ACE_TRY_ENV) + const char *name + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); protected: |