diff options
Diffstat (limited to 'TAO/tao')
| -rw-r--r-- | TAO/tao/ORB.cpp | 24 | ||||
| -rw-r--r-- | TAO/tao/ORB.h | 26 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/ORB_Manager.cpp | 21 |
3 files changed, 28 insertions, 43 deletions
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index 64f1ae6e359..3f6fe0ea2ac 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -227,41 +227,41 @@ CORBA_ORB::destroy (CORBA::Environment &ACE_TRY_ENV) this->orb_core_ = 0; } -int +void CORBA_ORB::run (CORBA::Environment &ACE_TRY_ENV) { - return this->run (0, ACE_TRY_ENV); + this->run (0, ACE_TRY_ENV); } -int +void CORBA_ORB::run (ACE_Time_Value &tv, CORBA::Environment &ACE_TRY_ENV) { - return this->run (&tv, ACE_TRY_ENV); + this->run (&tv, ACE_TRY_ENV); } -int +void CORBA_ORB::run (ACE_Time_Value *tv, CORBA::Environment &ACE_TRY_ENV) { this->check_shutdown (ACE_TRY_ENV); ACE_CHECK_RETURN (-1); - return this->orb_core ()->run (tv, 0, ACE_TRY_ENV); + this->orb_core ()->run (tv, 0, ACE_TRY_ENV); } -int +void CORBA_ORB::perform_work (CORBA::Environment &ACE_TRY_ENV) { - return this->perform_work (0, ACE_TRY_ENV); + this->perform_work (0, ACE_TRY_ENV); } -int +void CORBA_ORB::perform_work (ACE_Time_Value &tv, CORBA::Environment &ACE_TRY_ENV) { - return this->perform_work (&tv, ACE_TRY_ENV); + this->perform_work (&tv, ACE_TRY_ENV); } -int +void CORBA_ORB::perform_work (ACE_Time_Value *tv, CORBA::Environment &ACE_TRY_ENV) { @@ -269,7 +269,7 @@ CORBA_ORB::perform_work (ACE_Time_Value *tv, this->check_shutdown (ACE_TRY_ENV); ACE_CHECK_RETURN (-1); - return this->orb_core ()->run (tv, 1, ACE_TRY_ENV); + this->orb_core ()->run (tv, 1, ACE_TRY_ENV); } CORBA::Boolean diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h index 85f8cdb68ad..10146675c14 100644 --- a/TAO/tao/ORB.h +++ b/TAO/tao/ORB.h @@ -222,7 +222,7 @@ public: * If an error occurs during initialization or a run-time this * method will return -1. */ - int run (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); + void run (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); /** * Instructs the ORB to initialize itself and run its event loop in @@ -234,8 +234,8 @@ public: * we've returned since we've been asked to shut down the value of 1 * is returned. */ - int run (ACE_Time_Value &tv, - CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); + void run (ACE_Time_Value &tv, + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); /** * Instructs the ORB to initialize itself and run its event loop in @@ -247,8 +247,8 @@ public: * Otherwise, if we've returned since we've been asked to shut down * the value of 1 is returned. */ - int run (ACE_Time_Value *tv, - CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); + void run (ACE_Time_Value *tv, + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); /// Returns an indication of whether the ORB needs to perform some /// work. @@ -261,14 +261,14 @@ public: * behavior can be modified by passing an appropriate * <ACE_Time_Value>. */ - int perform_work (CORBA_Environment &ACE_TRY_ENV = - TAO_default_environment ()); - int perform_work (ACE_Time_Value &, - CORBA_Environment &ACE_TRY_ENV = - TAO_default_environment ()); - int perform_work (ACE_Time_Value *, - CORBA_Environment &ACE_TRY_ENV = - TAO_default_environment ()); + void perform_work (CORBA_Environment &ACE_TRY_ENV = + TAO_default_environment ()); + void perform_work (ACE_Time_Value &, + CORBA_Environment &ACE_TRY_ENV = + TAO_default_environment ()); + void perform_work (ACE_Time_Value *, + CORBA_Environment &ACE_TRY_ENV = + TAO_default_environment ()); /** * This operation instructs the ORB to shut down. Shutting down the diff --git a/TAO/tao/PortableServer/ORB_Manager.cpp b/TAO/tao/PortableServer/ORB_Manager.cpp index 090ab78e4fd..8c1dcbad4a2 100644 --- a/TAO/tao/PortableServer/ORB_Manager.cpp +++ b/TAO/tao/PortableServer/ORB_Manager.cpp @@ -273,14 +273,9 @@ TAO_ORB_Manager::run (CORBA_Environment &ACE_TRY_ENV, this->poa_manager_->activate (ACE_TRY_ENV); ACE_CHECK_RETURN (-1); - int status = this->orb_->run (tv, ACE_TRY_ENV); + this->orb_->run (tv, ACE_TRY_ENV); ACE_CHECK_RETURN (-1); - if (status == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) TAO_ORB_Manager %p\n"), - ACE_TEXT ("run")), - -1); return 0; } @@ -291,14 +286,9 @@ TAO_ORB_Manager::run (ACE_Time_Value &tv, this->poa_manager_->activate (ACE_TRY_ENV); ACE_CHECK_RETURN (-1); - int status = this->orb_->run (tv, ACE_TRY_ENV); + this->orb_->run (tv, ACE_TRY_ENV); ACE_CHECK_RETURN (-1); - if (status == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) TAO_ORB_Manager %p\n"), - ACE_TEXT ("run")), - -1); return 0; } @@ -323,14 +313,9 @@ TAO_ORB_Manager::run (CORBA_Environment &ACE_TRY_ENV) this->poa_manager_->activate (ACE_TRY_ENV); ACE_CHECK_RETURN (-1); - int status = this->orb_->run (ACE_TRY_ENV); + this->orb_->run (ACE_TRY_ENV); ACE_CHECK_RETURN (-1); - if (status == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) TAO_ORB_Manager %p\n"), - ACE_TEXT ("run")), - -1); return 0; } |