diff options
Diffstat (limited to 'TAO/tao/ORB_Core.h')
| -rw-r--r-- | TAO/tao/ORB_Core.h | 92 |
1 files changed, 46 insertions, 46 deletions
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h index 47621ec8385..cc9b7403a95 100644 --- a/TAO/tao/ORB_Core.h +++ b/TAO/tao/ORB_Core.h @@ -241,7 +241,7 @@ public: ACE_Thread_Manager *thr_mgr (void); /// Return the RootPOA, or try to load it if not initialized already. - CORBA::Object_ptr root_poa (CORBA::Environment &ACE_TRY_ENV); + CORBA::Object_ptr root_poa (TAO_ENV_SINGLE_ARG_DECL); /// Get the adapter registry TAO_Adapter_Registry *adapter_registry (void); @@ -268,8 +268,8 @@ public: * @note * No-Collocation is a special case of collocation. */ - static int collocation_strategy (CORBA::Object_ptr object, - CORBA::Environment &ACE_TRY_ENV); + static int collocation_strategy (CORBA::Object_ptr object + TAO_ENV_ARG_DECL); //@} /** @@ -399,7 +399,7 @@ public: const char *poa_factory_directive); /// Gets the value of TAO_ORB_Core::protocols_hooks__ - TAO_Protocols_Hooks * get_protocols_hooks (CORBA::Environment &ACE_TRY_ENV); + TAO_Protocols_Hooks * get_protocols_hooks (TAO_ENV_SINGLE_ARG_DECL); /// Sets the value of TAO_ORB_Core::dynamic_adapter_name_. static void dynamic_adapter_name (const char *name); @@ -620,21 +620,21 @@ public: /// Run the event loop. int run (ACE_Time_Value *tv, - int perform_work, - CORBA::Environment &ACE_TRY_ENV); + int perform_work + TAO_ENV_ARG_DECL); /// End the event loop - void shutdown (CORBA::Boolean wait_for_completion, - CORBA::Environment &ACE_TRY_ENV); + void shutdown (CORBA::Boolean wait_for_completion + TAO_ENV_ARG_DECL); /// Get the shutdown flag value int has_shutdown (void); /// Shutdown the ORB and free resources - void destroy (CORBA::Environment &ACE_TRY_ENV); + void destroy (TAO_ENV_SINGLE_ARG_DECL); /// Check if ORB has shutdown. If it has, throw an exception. - void check_shutdown (CORBA::Environment &ACE_TRY_ENV); + void check_shutdown (TAO_ENV_SINGLE_ARG_DECL); /// Returns the <timeout> value used by the server threads to poll /// the shutdown flag. If the return value is zero then the server @@ -645,23 +645,23 @@ public: /// based on the endpoint. TAO_Stub *create_stub_object (TAO_MProfile &mprofile, const char *type_id, - CORBA::PolicyList *policy_list, - CORBA::Environment &ACE_TRY_ENV); + CORBA::PolicyList *policy_list + TAO_ENV_ARG_DECL); /// Factory method that create the "right" Stub depending on /// wheather RTCORBA is loaded or not. The factory used to create /// the stub, is loaded at ORB initialization, and its type depends /// on the fact that RTCORBA is being used or not. TAO_Stub *create_stub (const char *repository_id, - const TAO_MProfile &profiles, - CORBA::Environment &ACE_TRY_ENV); + const TAO_MProfile &profiles + TAO_ENV_ARG_DECL); /// Give each registered IOR interceptor the opportunity to add /// tagged components to profiles of each created servant. void establish_components (TAO_MProfile &mp, - CORBA::PolicyList *policy_list, - CORBA::Environment &ACE_TRY_ENV); + CORBA::PolicyList *policy_list + TAO_ENV_ARG_DECL); /// Create a new object, use the adapter registry to create a /// collocated object, if not possible then create a regular @@ -678,30 +678,30 @@ public: //@} /// Resolve the TypeCodeFactory DLL. - CORBA::Object_ptr resolve_typecodefactory (CORBA::Environment &ACE_TRY_ENV); + CORBA::Object_ptr resolve_typecodefactory (TAO_ENV_SINGLE_ARG_DECL); /// Resolve the Dynamic Any Factory - CORBA::Object_ptr resolve_dynanyfactory (CORBA::Environment &ACE_TRY_ENV); + CORBA::Object_ptr resolve_dynanyfactory (TAO_ENV_SINGLE_ARG_DECL); /// Resolve the IOR Manipulation reference for this ORB. - CORBA::Object_ptr resolve_ior_manipulation (CORBA::Environment&); + CORBA::Object_ptr resolve_ior_manipulation (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); /// Resolve the IOR Table reference for this ORB. - CORBA::Object_ptr resolve_ior_table (CORBA::Environment&); + CORBA::Object_ptr resolve_ior_table (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); /// Resolve an initial reference via the -ORBInitRef and // -ORBDefaultInitRef options. - CORBA::Object_ptr resolve_rir (const char *name, - CORBA::Environment &); + CORBA::Object_ptr resolve_rir (const char *name + TAO_ENV_ARG_DECL_NOT_USED); /// Resolve the RT ORB reference for this ORB. - CORBA::Object_ptr resolve_rt_orb (CORBA::Environment &ACE_TRY_ENV); + CORBA::Object_ptr resolve_rt_orb (TAO_ENV_SINGLE_ARG_DECL); /// Resolve the RT Current flyweight for this ORB. - CORBA::Object_ptr resolve_rt_current (CORBA::Environment &ACE_TRY_ENV); + CORBA::Object_ptr resolve_rt_current (TAO_ENV_SINGLE_ARG_DECL); /// List all the service known by the ORB - CORBA_ORB_ObjectIdList_ptr list_initial_references (CORBA::Environment &); + CORBA_ORB_ObjectIdList_ptr list_initial_references (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); /// Reference counting... CORBA::ULong _incr_refcnt (void); @@ -759,8 +759,8 @@ public: /// whether they would like to add something to the list. void service_context_list (TAO_Stub *stub, TAO_Service_Context &service_context, - CORBA::Boolean retstart, - CORBA::Environment &ACE_TRY_ENV); + CORBA::Boolean retstart + TAO_ENV_ARG_DECL); /// Return a reference to the Fault Tolerant service object. TAO_Fault_Tolerance_Service &fault_tolerance_service (void); @@ -769,15 +769,15 @@ public: /// delegate to the service to see what the service has to do for /// this case. int service_raise_comm_failure (TAO_GIOP_Invocation *invoke, - TAO_Profile *profile, - CORBA::Environment &ACE_TRY_ENV); + TAO_Profile *profile + TAO_ENV_ARG_DECL); /// Raise a transient failure exception if a service is not loaded, /// else delegate to the service to see what the service has to do /// for this case. int service_raise_transient_failure (TAO_GIOP_Invocation *invoke, - TAO_Profile *profile, - CORBA::Environment &ACE_TRY_ENV); + TAO_Profile *profile + TAO_ENV_ARG_DECL); /// Hook for logging of messages by the Logging & Recovery service /// of an FT service. @@ -811,13 +811,13 @@ public: /// Register a client request interceptor. void add_interceptor ( - PortableInterceptor::ClientRequestInterceptor_ptr interceptor, - CORBA_Environment &ACE_TRY_ENV); + PortableInterceptor::ClientRequestInterceptor_ptr interceptor + TAO_ENV_ARG_DECL); /// Register a server request interceptor. void add_interceptor ( - PortableInterceptor::ServerRequestInterceptor_ptr interceptor, - CORBA_Environment &ACE_TRY_ENV); + PortableInterceptor::ServerRequestInterceptor_ptr interceptor + TAO_ENV_ARG_DECL); /// Return the array of client-side interceptors specific to this /// ORB. @@ -833,16 +833,16 @@ public: /// Register an IOR interceptor. void add_interceptor ( - PortableInterceptor::IORInterceptor_ptr interceptor, - CORBA_Environment &ACE_TRY_ENV); + PortableInterceptor::IORInterceptor_ptr interceptor + TAO_ENV_ARG_DECL); /// Return the array of IOR interceptors specific to this ORB. TAO_IORInterceptor_List::TYPE & ior_interceptors (void); //@} /// Call the bidir_giop library to parse the policy. - int parse_bidir_policy (CORBA::Policy_ptr policy, - CORBA::Environment &ACE_TRY_ENV); + int parse_bidir_policy (CORBA::Policy_ptr policy + TAO_ENV_ARG_DECL); /// Set and Get methods to indicate whether a BiDir IIOP policy has /// been set in the POA. @@ -874,7 +874,7 @@ protected: /// Initialize the guts of the ORB Core. It is intended that this be /// called by <CORBA::ORB_init>. - int init (int &argc, char **argv, CORBA::Environment &ACE_TRY_ENV); + int init (int &argc, char **argv TAO_ENV_ARG_DECL); /// Final termination hook, typically called by CORBA::ORB's /// destructor. @@ -895,17 +895,17 @@ protected: ACE_Lock *lock); /// Obtain and cache the dynamic any factory object reference. - void resolve_typecodefactory_i (CORBA::Environment &ACE_TRY_ENV); + void resolve_typecodefactory_i (TAO_ENV_SINGLE_ARG_DECL); /// Obtain and cache the dynamic any factory object reference. - void resolve_dynanyfactory_i (CORBA::Environment &ACE_TRY_ENV); + void resolve_dynanyfactory_i (TAO_ENV_SINGLE_ARG_DECL); /// Obtain and cache the IORManipulation factory object reference. - void resolve_iormanipulation_i (CORBA::Environment &ACE_TRY_ENV); + void resolve_iormanipulation_i (TAO_ENV_SINGLE_ARG_DECL); /// Search the Dynamic service list for BiDirectional options that /// can be dynamically loaded. - int bidirectional_giop_init (CORBA::Environment &ACE_TRY_ENV); + int bidirectional_giop_init (TAO_ENV_SINGLE_ARG_DECL); /// Search the Dynamic service list for well known services that has /// callbacks which can be dynamically loaded. @@ -913,7 +913,7 @@ protected: /// Helper method that invokes Interceptor::destroy() on all /// registered interceptors when ORB::destroy() is called. - void destroy_interceptors (CORBA::Environment &ACE_TRY_ENV); + void destroy_interceptors (TAO_ENV_SINGLE_ARG_DECL); private: @@ -924,7 +924,7 @@ private: //@} /// Obtain and cache the dynamic any factory object reference. - void resolve_ior_table_i (CORBA::Environment &ACE_TRY_ENV); + void resolve_ior_table_i (TAO_ENV_SINGLE_ARG_DECL); /// Try to create a new collocated object, using <other_orb> as the /// target ORB. If not possible return 0. |