diff options
Diffstat (limited to 'TAO/tests/AMH_Exceptions/server.cpp')
| -rw-r--r-- | TAO/tests/AMH_Exceptions/server.cpp | 22 |
1 files changed, 10 insertions, 12 deletions
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); |