diff options
Diffstat (limited to 'TAO/tao/TAO.h')
| -rw-r--r-- | TAO/tao/TAO.h | 43 |
1 files changed, 15 insertions, 28 deletions
diff --git a/TAO/tao/TAO.h b/TAO/tao/TAO.h index 86f56a2de42..bf06aee10e6 100644 --- a/TAO/tao/TAO.h +++ b/TAO/tao/TAO.h @@ -46,21 +46,21 @@ public: int init (int &argc, char *argv[], - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // Initialize the ORB/root POA, using the supplied command line // arguments or the default ORB components. Returns -1 on failure. int init (int &argc, char *argv[], const char *orb_name, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // Initialize the ORB/root POA, using the supplied command line // arguments or the default ORB components. Returns -1 on failure. int init_child_poa (int &argc, char *argv[], const char *poa_name, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // Creates a child poa under the root poa with PERSISTENT and // USER_ID policies. Call this if you want a <child_poa> with the // above policies, otherwise call init. Returns -1 on failure. @@ -69,12 +69,12 @@ public: char *argv[], const char *poa_name, const char *orb_name, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // Creates a child poa under the root poa with PERSISTENT and // USER_ID policies. Call this if you want a <child_poa> with the // above policies, otherwise call init. Returns -1 on failure. - int activate_poa_manager (CORBA_Environment &ACE_TRY_ENV = + int activate_poa_manager (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // Put POA manager into the <Active> state, so that incoming corba // requests are processed. This method is useful for clients, @@ -83,56 +83,43 @@ public: // call on a server. Returns -1 on failure. CORBA::String activate (PortableServer::Servant servant, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // Activate <servant>, using the POA <activate_object> call. Users // can call this method multiple times to activate multiple objects. // Returns 0 on failure. void deactivate (const char *id, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // Deactivate object in RootPOA. CORBA::String activate_under_child_poa (const char *servant_name, PortableServer::Servant servant, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // Precondition: init_child_poa has been called. Activate <servant> // using the POA <activate_object_with_id> created from the string // servant_name. Users should call this to activate objects under // the child_poa. void deactivate_under_child_poa (const char *id, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // Deactivate object in child POA. - int run (CORBA_Environment &ACE_TRY_ENV, + int run (CORBA_Environment &TAO_IN_ENV, ACE_Time_Value *tv); int run (ACE_Time_Value &tv, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); - int run (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); + int run (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()); // Run the ORB event loop with the specified <tv> time value Returns // -1 on failure. CORBA::ORB_ptr orb (void); - // Accessor which returns the ORB pointer. Following the normal - // CORBA memory management rules of return values from functions, - // this function duplicates the orb return value before returning - // it. + // Accessor which returns the ORB pointer. PortableServer::POA_ptr root_poa (void); - // Accessor which returns the root poa. Following the normal CORBA - // memory management rules of return values from functions, this - // function duplicates the poa return value before returning it. + // Accessor which returns the root poa PortableServer::POA_ptr child_poa (void); - // Accessor which returns the child poa. Following the normal CORBA - // memory management rules of return values from functions, this - // function duplicates the poa return value before returning it. - - PortableServer::POAManager_ptr poa_manager (void); - // Accessor which returns the poa manager. Following the normal - // CORBA memory management rules of return values from functions, - // this function duplicates the poa manager return value before - // returning it. + // Accessor which returns the child poa protected: CORBA::ORB_var orb_; |