summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/tests/Time/Client_i.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/tests/Time/Client_i.cpp')
-rw-r--r--TAO/orbsvcs/tests/Time/Client_i.cpp66
1 files changed, 33 insertions, 33 deletions
diff --git a/TAO/orbsvcs/tests/Time/Client_i.cpp b/TAO/orbsvcs/tests/Time/Client_i.cpp
index 3036479c109..46bc4dd1d3e 100644
--- a/TAO/orbsvcs/tests/Time/Client_i.cpp
+++ b/TAO/orbsvcs/tests/Time/Client_i.cpp
@@ -30,11 +30,11 @@ Client_i::test_for_secure_universal_time (void)
ACE_DEBUG ((LM_DEBUG,
"[CLIENT] Process/Thread Id : (%P/%t) Testing secure_time()\n"));
- TAO_ENV_DECLARE_NEW_ENV;
+ ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
CosTime::UTO_var UTO_server =
- this->clerk_->secure_universal_time (TAO_ENV_SINGLE_ARG_PARAMETER);
+ this->clerk_->secure_universal_time (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
@@ -55,11 +55,11 @@ Client_i::test_for_universal_time (void)
{
ACE_DEBUG ((LM_DEBUG,
"[CLIENT] Process/Thread Id : (%P/%t) Testing universal_time()\n"));
- TAO_ENV_DECLARE_NEW_ENV;
+ ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
CosTime::UTO_var UTO_server =
- this->clerk_->universal_time (TAO_ENV_SINGLE_ARG_PARAMETER);
+ this->clerk_->universal_time (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
@@ -108,21 +108,21 @@ Client_i::test_for_new_universal_time (void)
ACE_DEBUG ((LM_DEBUG,
"[CLIENT] Process/Thread Id : (%P/%t) Testing new_universal_time()\n"));
- TAO_ENV_DECLARE_NEW_ENV;
+ ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
CosTime::UTO_var UTO_server = this->clerk_->new_universal_time (time,
inaccuracy,
tdf
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
- ACE_ASSERT (UTO_server->time (TAO_ENV_SINGLE_ARG_PARAMETER) == 999999999);
- ACE_ASSERT (UTO_server->inaccuracy (TAO_ENV_SINGLE_ARG_PARAMETER) == 9999);
- ACE_ASSERT (UTO_server->tdf (TAO_ENV_SINGLE_ARG_PARAMETER) == 99);
- ACE_ASSERT ((UTO_server->utc_time (TAO_ENV_SINGLE_ARG_PARAMETER)).time == 999999999);
- ACE_ASSERT ((UTO_server->utc_time (TAO_ENV_SINGLE_ARG_PARAMETER)).inacchi == 0);
- ACE_ASSERT ((UTO_server->utc_time (TAO_ENV_SINGLE_ARG_PARAMETER)).inacclo == 9999);
- ACE_ASSERT ((UTO_server->utc_time (TAO_ENV_SINGLE_ARG_PARAMETER)).tdf == 99);
+ ACE_ASSERT (UTO_server->time (ACE_ENV_SINGLE_ARG_PARAMETER) == 999999999);
+ ACE_ASSERT (UTO_server->inaccuracy (ACE_ENV_SINGLE_ARG_PARAMETER) == 9999);
+ ACE_ASSERT (UTO_server->tdf (ACE_ENV_SINGLE_ARG_PARAMETER) == 99);
+ ACE_ASSERT ((UTO_server->utc_time (ACE_ENV_SINGLE_ARG_PARAMETER)).time == 999999999);
+ ACE_ASSERT ((UTO_server->utc_time (ACE_ENV_SINGLE_ARG_PARAMETER)).inacchi == 0);
+ ACE_ASSERT ((UTO_server->utc_time (ACE_ENV_SINGLE_ARG_PARAMETER)).inacclo == 9999);
+ ACE_ASSERT ((UTO_server->utc_time (ACE_ENV_SINGLE_ARG_PARAMETER)).tdf == 99);
ACE_TRY_CHECK;
}
@@ -148,23 +148,23 @@ Client_i::test_for_uto_from_utc (void)
ACE_DEBUG ((LM_DEBUG,
"[CLIENT] Process/Thread Id : (%P/%t) Testing uto_from_utc ()\n"));
- TAO_ENV_DECLARE_NEW_ENV;
+ ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
CosTime::UTO_var UTO_server = this->clerk_->uto_from_utc (utc_struct
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
TimeBase::InaccuracyT inaccuracy = utc_struct.inacchi;
inaccuracy <<= 32;
inaccuracy |= utc_struct.inacclo;
- ACE_ASSERT (UTO_server->time (TAO_ENV_SINGLE_ARG_PARAMETER) == 999999999);
- ACE_ASSERT (UTO_server->inaccuracy (TAO_ENV_SINGLE_ARG_PARAMETER) == inaccuracy);
- ACE_ASSERT (UTO_server->tdf (TAO_ENV_SINGLE_ARG_PARAMETER) == 99);
- ACE_ASSERT ((UTO_server->utc_time (TAO_ENV_SINGLE_ARG_PARAMETER)).time == 999999999);
- ACE_ASSERT ((UTO_server->utc_time (TAO_ENV_SINGLE_ARG_PARAMETER)).inacclo == 50);
- ACE_ASSERT ((UTO_server->utc_time (TAO_ENV_SINGLE_ARG_PARAMETER)).inacchi == 50);
- ACE_ASSERT ((UTO_server->utc_time (TAO_ENV_SINGLE_ARG_PARAMETER)).tdf == 99);
+ ACE_ASSERT (UTO_server->time (ACE_ENV_SINGLE_ARG_PARAMETER) == 999999999);
+ ACE_ASSERT (UTO_server->inaccuracy (ACE_ENV_SINGLE_ARG_PARAMETER) == inaccuracy);
+ ACE_ASSERT (UTO_server->tdf (ACE_ENV_SINGLE_ARG_PARAMETER) == 99);
+ ACE_ASSERT ((UTO_server->utc_time (ACE_ENV_SINGLE_ARG_PARAMETER)).time == 999999999);
+ ACE_ASSERT ((UTO_server->utc_time (ACE_ENV_SINGLE_ARG_PARAMETER)).inacclo == 50);
+ ACE_ASSERT ((UTO_server->utc_time (ACE_ENV_SINGLE_ARG_PARAMETER)).inacchi == 50);
+ ACE_ASSERT ((UTO_server->utc_time (ACE_ENV_SINGLE_ARG_PARAMETER)).tdf == 99);
ACE_TRY_CHECK;
}
@@ -186,15 +186,15 @@ Client_i::test_for_new_interval (void)
ACE_DEBUG ((LM_DEBUG,
"[CLIENT] Process/Thread Id : (%P/%t) Testing new_interval ()\n"));
- TAO_ENV_DECLARE_NEW_ENV;
+ ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
CosTime::TIO_var TIO_server = this->clerk_->new_interval (lower,
upper
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
- ACE_ASSERT ((TIO_server->time_interval (TAO_ENV_SINGLE_ARG_PARAMETER)).lower_bound == 666666666);
- ACE_ASSERT ((TIO_server->time_interval (TAO_ENV_SINGLE_ARG_PARAMETER)).upper_bound == 999999999);
+ ACE_ASSERT ((TIO_server->time_interval (ACE_ENV_SINGLE_ARG_PARAMETER)).lower_bound == 666666666);
+ ACE_ASSERT ((TIO_server->time_interval (ACE_ENV_SINGLE_ARG_PARAMETER)).upper_bound == 999999999);
ACE_TRY_CHECK;
}
@@ -324,7 +324,7 @@ Client_i::~Client_i (void)
int
Client_i::obtain_initial_references (void)
{
- TAO_ENV_DECLARE_NEW_ENV;
+ ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
@@ -356,11 +356,11 @@ Client_i::obtain_initial_references (void)
CORBA::Object_var temp_object =
my_name_client_->resolve (clerk_name
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
clerk_ = CosTime::TimeService::_narrow (temp_object.in ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (CORBA::is_nil (clerk_.in ()))
@@ -388,7 +388,7 @@ 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
{
@@ -396,7 +396,7 @@ Client_i::init (int argc, char **argv)
this->orb_ = CORBA::ORB_init (this->argc_,
this->argv_,
0
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
// Parse command line and verify parameters.
@@ -410,7 +410,7 @@ Client_i::init (int argc, char **argv)
CORBA::Object_var server_object =
this->orb_->string_to_object (this->ior_
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (CORBA::is_nil (server_object.in ()))
@@ -420,7 +420,7 @@ Client_i::init (int argc, char **argv)
-1);
this->clerk_ =
CosTime::TimeService::_narrow (server_object.in ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_DEBUG ((LM_DEBUG,
"[CLIENT] Process/Thread Id : (%P/%t) Using the IOR provided\n"));
View Lorry Controller Status