summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp')
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
index 97786e3d430..7bfff820378 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
@@ -59,11 +59,11 @@ Airplane_Client_i::get_planes (size_t count)
{
for (size_t i = 0; i < count; i++)
{
- TAO_ENV_DECLARE_NEW_ENV;
+ ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
CORBA::String_var response =
- this->server_->get_plane (TAO_ENV_SINGLE_ARG_PARAMETER);
+ this->server_->get_plane (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "Plane %d is %s\n", i, response.in ()));
@@ -103,14 +103,14 @@ Airplane_Client_i::init (int argc, char **argv)
this->argc_ = argc;
this->argv_ = argv;
- TAO_ENV_DECLARE_NEW_ENV;
+ ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
// Retrieve the ORB.
this->orb_ = CORBA::ORB_init (this->argc_,
this->argv_,
"internet"
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
// Parse command line and verify parameters.
@@ -124,10 +124,10 @@ Airplane_Client_i::init (int argc, char **argv)
-1);
CORBA::Object_var server_object =
- this->orb_->string_to_object (this->server_key_ TAO_ENV_ARG_PARAMETER);
+ this->orb_->string_to_object (this->server_key_ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- this->server_ = Paper_Airplane_Server::_narrow (server_object.in() TAO_ENV_ARG_PARAMETER);
+ this->server_ = Paper_Airplane_Server::_narrow (server_object.in() ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (CORBA::is_nil (server_object.in ()))