diff options
Diffstat (limited to 'TAO/tests/Big_Twoways/Session.cpp')
| -rw-r--r-- | TAO/tests/Big_Twoways/Session.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/TAO/tests/Big_Twoways/Session.cpp b/TAO/tests/Big_Twoways/Session.cpp index efe3afe001f..2ec327b5946 100644 --- a/TAO/tests/Big_Twoways/Session.cpp +++ b/TAO/tests/Big_Twoways/Session.cpp @@ -36,7 +36,7 @@ Session::svc (void) /// thread PortableServer::ServantBase_var auto_decrement (this); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -63,7 +63,7 @@ Session::svc (void) { Test::Payload_var received = this->other_sessions_[j]->echo_payload (payload - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -76,7 +76,7 @@ Session::svc (void) return 0; } } - this->terminate (1 TAO_ENV_ARG_PARAMETER); + this->terminate (1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -91,7 +91,7 @@ Session::svc (void) void Session::start (const Test::Session_List &other_sessions - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Test::Already_Running, Test::No_Peers)) @@ -112,12 +112,12 @@ Session::start (const Test::Session_List &other_sessions // access to this object.... ACE_TRY { - this->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (this->task_.activate ( THR_NEW_LWP | THR_JOINABLE, 1, 1) == -1) { - this->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } else @@ -144,12 +144,12 @@ Session::start (const Test::Session_List &other_sessions } /// None of the threads are running, this session is useless at /// this point, report the problem and destroy the local objects - this->terminate (0 TAO_ENV_ARG_PARAMETER); + this->terminate (0 ACE_ENV_ARG_PARAMETER); } Test::Payload * Session::echo_payload (const Test::Payload &the_payload - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (the_payload.length () != this->payload_size_) @@ -188,7 +188,7 @@ Session::echo_payload (const Test::Payload &the_payload if (this->more_work ()) return retval._retn (); } - this->terminate (1 TAO_ENV_ARG_PARAMETER); + this->terminate (1 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return retval._retn (); @@ -196,18 +196,18 @@ Session::echo_payload (const Test::Payload &the_payload void -Session::destroy (TAO_ENV_SINGLE_ARG_DECL) +Session::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Make sure local resources are released PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var oid = - poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -224,14 +224,14 @@ Session::more_work (void) const void Session::terminate (CORBA::Boolean success - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (()) { // Make sure that global resources are released ACE_TRY_EX(GLOBAL) { this->control_->session_finished (success - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX(GLOBAL); } ACE_CATCHANY |