diff options
-rw-r--r-- | TAO/ChangeLog | 13 | ||||
-rw-r--r-- | TAO/examples/AMH/Sink_Server/AMH_Servant.cpp | 6 | ||||
-rw-r--r-- | TAO/examples/AMH/Sink_Server/AMH_Servant.h | 6 | ||||
-rw-r--r-- | TAO/examples/AMH/Sink_Server/Base_Server.cpp | 20 | ||||
-rw-r--r-- | TAO/examples/AMH/Sink_Server/client.cpp | 12 | ||||
-rw-r--r-- | TAO/tests/AMH_Exceptions/client.cpp | 8 | ||||
-rw-r--r-- | TAO/tests/AMH_Exceptions/server.cpp | 22 |
7 files changed, 50 insertions, 37 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index e18d962ce55..82b6825f205 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,16 @@ +Wed Jul 10 15:38:48 2002 Mayur Deshpande <mayur@ics.uci.edu> + + * examples/AMH/Sink_Server/AMH_Servant.h: + * examples/AMH/Sink_Server/AMH_Servant.cpp: + * examples/AMH/Sink_Server/Base_Server.cpp: + * examples/AMH/Sink_Server/client.cpp: + + * examples/AMH/Sink_Server/client.cpp: + * examples/AMH/Sink_Server/server.cpp: + + Changed deprecated TAO_ENV_ exception macros to ACE_ENV_ + exception macros. + Wed Jul 10 14:25:14 2002 Nanbor Wang <nanbor@cs.wustl.edu> * tao/ccm_core/Component_Base.idl: diff --git a/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp b/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp index b8bd2c4c171..5e34311b89a 100644 --- a/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp +++ b/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp @@ -62,7 +62,7 @@ AMH_Servant::parse_args (int *argc, char **argv) void AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh, Test::Timestamp send_time - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // Handler will 'kill' itself when it is done. @@ -83,7 +83,7 @@ AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh, void AMH_Servant::start_test (Test::AMH_RoundtripResponseHandler_ptr _tao_rh - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { _tao_rh->start_test (); @@ -91,7 +91,7 @@ AMH_Servant::start_test (Test::AMH_RoundtripResponseHandler_ptr _tao_rh void AMH_Servant::end_test (Test::AMH_RoundtripResponseHandler_ptr _tao_rh - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { _tao_rh->end_test (); diff --git a/TAO/examples/AMH/Sink_Server/AMH_Servant.h b/TAO/examples/AMH/Sink_Server/AMH_Servant.h index 8b9f0d8e586..88b07532d2d 100644 --- a/TAO/examples/AMH/Sink_Server/AMH_Servant.h +++ b/TAO/examples/AMH/Sink_Server/AMH_Servant.h @@ -35,16 +35,16 @@ class AMH_Servant // = The skeleton methods virtual void start_test (Test::AMH_RoundtripResponseHandler_ptr _tao_rh - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void end_test (Test::AMH_RoundtripResponseHandler_ptr _tao_rh - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh, Test::Timestamp send_time - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/TAO/examples/AMH/Sink_Server/Base_Server.cpp b/TAO/examples/AMH/Sink_Server/Base_Server.cpp index ffa86f9ade6..06eb464930c 100644 --- a/TAO/examples/AMH/Sink_Server/Base_Server.cpp +++ b/TAO/examples/AMH/Sink_Server/Base_Server.cpp @@ -21,10 +21,10 @@ Base_Server::~Base_Server () { ACE_TRY_NEW_ENV { - this->root_poa_->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->orb_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -109,11 +109,11 @@ Base_Server::start_orb_and_poa (void) { this->orb_ = CORBA::ORB_init (*(this->argc_), this->argv_, - "" TAO_ENV_ARG_PARAMETER); + "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - this->orb_->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -122,14 +122,14 @@ Base_Server::start_orb_and_poa (void) 1); this->root_poa_ = PortableServer::POA::_narrow ( poa_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - this->root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; return 0; @@ -140,6 +140,8 @@ Base_Server::start_orb_and_poa (void) return -1; } ACE_ENDTRY; + + return 0; } void @@ -148,11 +150,11 @@ Base_Server::register_servant (AMH_Servant *servant) ACE_TRY_NEW_ENV { Test::Roundtrip_var roundtrip = - servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - this->orb_->object_to_string (roundtrip.in () TAO_ENV_ARG_PARAMETER); + this->orb_->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; (void) this->write_ior_to_file (ior); diff --git a/TAO/examples/AMH/Sink_Server/client.cpp b/TAO/examples/AMH/Sink_Server/client.cpp index 49c698fd421..b729ebd49e9 100644 --- a/TAO/examples/AMH/Sink_Server/client.cpp +++ b/TAO/examples/AMH/Sink_Server/client.cpp @@ -130,15 +130,15 @@ Client_Task::narrow_servant (void) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (this->argc_, this->argv_, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (this->argc_, this->argv_, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = - orb->string_to_object (this->ior_ TAO_ENV_ARG_PARAMETER); + orb->string_to_object (this->ior_ ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->roundtrip_ = - Test::Roundtrip::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (this->roundtrip_.in ())) @@ -167,10 +167,10 @@ Client_Task::run_test (void) ACE_TRY { test_start = ACE_OS::gethrtime (); - this->roundtrip_->start_test (TAO_ENV_ARG_PARAMETER); + this->roundtrip_->start_test (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->svc (); - this->roundtrip_->end_test (TAO_ENV_ARG_PARAMETER); + this->roundtrip_->end_test (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; test_end = ACE_OS::gethrtime (); } @@ -204,7 +204,7 @@ Client_Task::svc (void) { CORBA::ULongLong start = ACE_OS::gethrtime (); - (void) this->roundtrip_->test_method (start TAO_ENV_ARG_PARAMETER); + (void) this->roundtrip_->test_method (start ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_hrtime_t now = ACE_OS::gethrtime (); diff --git a/TAO/tests/AMH_Exceptions/client.cpp b/TAO/tests/AMH_Exceptions/client.cpp index 13237024c88..b8f254e620e 100644 --- a/TAO/tests/AMH_Exceptions/client.cpp +++ b/TAO/tests/AMH_Exceptions/client.cpp @@ -15,15 +15,15 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = - orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test::Roundtrip_var roundtrip = - Test::Roundtrip::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (roundtrip.in ())) @@ -35,7 +35,7 @@ main (int argc, char *argv[]) } long long unsigned int time = 10; - roundtrip->test_method (time TAO_ENV_ARG_PARAMETER); + roundtrip->test_method (time ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/AMH_Exceptions/server.cpp b/TAO/tests/AMH_Exceptions/server.cpp index 684bcc88470..5bac09cfe96 100644 --- a/TAO/tests/AMH_Exceptions/server.cpp +++ b/TAO/tests/AMH_Exceptions/server.cpp @@ -41,13 +41,11 @@ ST_AMH_Servant::ST_AMH_Servant (CORBA::ORB_ptr orb) void ST_AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh, Test::Timestamp send_time - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Throw an overload exception - ACE_DECLARE_NEW_CORBA_ENV; - Test::ServerOverload *ts = new Test::ServerOverload; // Calee owns the memory now. Need not delete 'ts' @@ -124,10 +122,10 @@ ST_AMH_Server::~ST_AMH_Server () { ACE_TRY_NEW_ENV { - this->root_poa_->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->orb_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -145,11 +143,11 @@ ST_AMH_Server::start_orb_and_poa (void) { this->orb_ = CORBA::ORB_init (*(this->argc_), this->argv_, - "" TAO_ENV_ARG_PARAMETER); + "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - this->orb_->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -158,14 +156,14 @@ ST_AMH_Server::start_orb_and_poa (void) 1); this->root_poa_ = PortableServer::POA::_narrow (poa_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - this->root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; return 0; @@ -186,11 +184,11 @@ ST_AMH_Server::register_servant (ST_AMH_Servant *servant) ACE_TRY_NEW_ENV { Test::Roundtrip_var roundtrip = - servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - this->orb_->object_to_string (roundtrip.in () TAO_ENV_ARG_PARAMETER); + this->orb_->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; (void) this->write_ior_to_file (ior); |