diff options
| -rw-r--r-- | TAO/tao/tao_util.cpp | 15 | ||||
| -rw-r--r-- | TAO/tao/tao_util.h | 9 |
2 files changed, 12 insertions, 12 deletions
diff --git a/TAO/tao/tao_util.cpp b/TAO/tao/tao_util.cpp index 30b82715fe9..09146cf3ac9 100644 --- a/TAO/tao/tao_util.cpp +++ b/TAO/tao/tao_util.cpp @@ -15,7 +15,6 @@ #include "tao_util.h" - // constructor TAO_ORB_Manager::TAO_ORB_Manager (CORBA::ORB_ptr orb, PortableServer::POA_ptr root_poa, @@ -29,6 +28,7 @@ TAO_ORB_Manager::TAO_ORB_Manager (CORBA::ORB_ptr orb, // Initialize the ORB, using the supplied command line arguments. the // poa_name is a user-supplied string that is used to name the POA // created. + int TAO_ORB_Manager::init (int argc, char **argv, @@ -50,9 +50,9 @@ TAO_ORB_Manager::init (int argc, this->orb_->resolve_initial_references ("RootPOA"); if (CORBA::is_nil (poa_object.in ())) - ACE_ERROR_RETURN ( (LM_ERROR, - " (%P|%t) Unable to initialize the POA.\n"), - 1); + ACE_ERROR_RETURN ((LM_ERROR, + " (%P|%t) Unable to initialize the POA.\n"), + 1); // Get the POA object. this->root_poa_ = @@ -74,12 +74,12 @@ TAO_ORB_Manager::init (int argc, return 0; } -// activate servant in the poa +// Activate servant in the POA. + CORBA::String TAO_ORB_Manager::activate (PortableServer::Servant servant, CORBA_Environment &env) { - PortableServer::ObjectId_var id = this->root_poa_->activate_object (servant, env); @@ -98,7 +98,8 @@ TAO_ORB_Manager::activate (PortableServer::Servant servant, return str; } -// enter the orb event loop +// Enter the orb event loop. + int TAO_ORB_Manager::run (CORBA_Environment &env, ACE_Time_Value *tv) diff --git a/TAO/tao/tao_util.h b/TAO/tao/tao_util.h index 1be76d2046f..15caf669db3 100644 --- a/TAO/tao/tao_util.h +++ b/TAO/tao/tao_util.h @@ -35,13 +35,12 @@ public: char **argv, CORBA_Environment &env); // Initialize the ORB/POA, using the supplied command line - // arguments. + // arguments or the default ORB components. CORBA::String activate (PortableServer::Servant servant, CORBA_Environment &env); - // Activate <servant>, using the POA activate_object () call - // Users can call this method multiple times to activate multiple - // objects. + // Activate <servant>, using the POA <activate_object> call. Users + // can call this method multiple times to activate multiple objects. int run (CORBA_Environment &env, ACE_Time_Value *tv = 0); @@ -50,7 +49,7 @@ public: CORBA::ORB_ptr orb (void); // Accessor which returns the ORB pointer. - ~TAO_ORB_Manager (); + ~TAO_ORB_Manager (void); // Destructor protected: |