summaryrefslogtreecommitdiff
path: root/TAO/tests/AMI
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tests/AMI')
-rw-r--r--TAO/tests/AMI/ami_test_i.cpp8
-rw-r--r--TAO/tests/AMI/ami_test_i.h8
-rw-r--r--TAO/tests/AMI/client.cpp42
-rw-r--r--TAO/tests/AMI/server.cpp22
-rw-r--r--TAO/tests/AMI/simple_client.cpp52
5 files changed, 66 insertions, 66 deletions
diff --git a/TAO/tests/AMI/ami_test_i.cpp b/TAO/tests/AMI/ami_test_i.cpp
index 3745bc069ea..4586a4d67a1 100644
--- a/TAO/tests/AMI/ami_test_i.cpp
+++ b/TAO/tests/AMI/ami_test_i.cpp
@@ -33,7 +33,7 @@ CORBA::Long
AMI_Test_i::foo (CORBA::Long_out out_l,
CORBA::Long in_l,
const char* in_str
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
A::DidTheRightThing))
{
@@ -58,7 +58,7 @@ AMI_Test_i::foo (CORBA::Long_out out_l,
void
-AMI_Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+AMI_Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->orb_->shutdown (0);
@@ -66,7 +66,7 @@ AMI_Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
CORBA::Long
-AMI_Test_i::yadda (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+AMI_Test_i::yadda (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_DEBUG ((LM_DEBUG,
@@ -77,7 +77,7 @@ AMI_Test_i::yadda (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
void
AMI_Test_i::yadda (CORBA::Long yadda
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/AMI/ami_test_i.h b/TAO/tests/AMI/ami_test_i.h
index 8e877174b25..719c9e34f88 100644
--- a/TAO/tests/AMI/ami_test_i.h
+++ b/TAO/tests/AMI/ami_test_i.h
@@ -38,18 +38,18 @@ public:
CORBA::Long foo (CORBA::Long_out out_l,
CORBA::Long in_l,
const char* in_str
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
A::DidTheRightThing));
- void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException));
- CORBA::Long yadda (TAO_ENV_SINGLE_ARG_DECL)
+ CORBA::Long yadda (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
void yadda (CORBA::Long yadda
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/TAO/tests/AMI/client.cpp b/TAO/tests/AMI/client.cpp
index 3dfd4a579a1..6fb873efd42 100644
--- a/TAO/tests/AMI/client.cpp
+++ b/TAO/tests/AMI/client.cpp
@@ -100,7 +100,7 @@ public:
void foo (CORBA::Long result,
CORBA::Long out_l
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (debug)
@@ -115,7 +115,7 @@ public:
};
void foo_excep (A::AMI_AMI_TestExceptionHolder * excep_holder
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
@@ -123,7 +123,7 @@ public:
"Callback method <foo_excep> called: \n"));
ACE_TRY
{
- excep_holder->raise_foo (TAO_ENV_SINGLE_ARG_PARAMETER);
+ excep_holder->raise_foo (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -136,7 +136,7 @@ public:
};
void get_yadda (CORBA::Long result
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_DEBUG ((LM_DEBUG,
@@ -145,14 +145,14 @@ public:
};
void get_yadda_excep (A::AMI_AMI_TestExceptionHolder *
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_DEBUG ((LM_DEBUG,
"Callback method <get_yadda_excep> called: \n"));
};
- void set_yadda (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ void set_yadda (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_DEBUG ((LM_DEBUG,
@@ -160,7 +160,7 @@ public:
};
void set_yadda_excep (A::AMI_AMI_TestExceptionHolder *
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_DEBUG ((LM_DEBUG,
@@ -175,22 +175,22 @@ Handler handler;
int
main (int argc, char *argv[])
{
- TAO_ENV_DECLARE_NEW_ENV;
+ ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
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;
if (parse_args (argc, argv) != 0)
return 1;
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;
A::AMI_Test_var server =
- A::AMI_Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+ A::AMI_Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (CORBA::is_nil (server.in ()))
@@ -204,7 +204,7 @@ main (int argc, char *argv[])
// Activate POA to handle the call back.
CORBA::Object_var poa_object =
- orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+ orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (CORBA::is_nil (poa_object.in ()))
@@ -213,14 +213,14 @@ main (int argc, char *argv[])
1);
PortableServer::POA_var root_poa =
- PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+ PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+ 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;
// Let the client perform the test in a separate thread
@@ -248,12 +248,12 @@ main (int argc, char *argv[])
while (number_of_replies > 0)
{
CORBA::Boolean pending =
- orb->work_pending(TAO_ENV_SINGLE_ARG_PARAMETER);
+ orb->work_pending(ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
if (pending)
{
- orb->perform_work(TAO_ENV_SINGLE_ARG_PARAMETER);
+ orb->perform_work(ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
}
@@ -274,10 +274,10 @@ main (int argc, char *argv[])
root_poa->destroy (1, // ethernalize objects
0 // wait for completion
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+ orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -298,7 +298,7 @@ Client::Client (A::AMI_Test_ptr server,
: ami_test_var_ (A::AMI_Test::_duplicate (server)),
niterations_ (niterations)
{
- the_handler_var_ = handler._this (/* TAO_ENV_SINGLE_ARG_PARAMETER */);
+ the_handler_var_ = handler._this (/* ACE_ENV_SINGLE_ARG_PARAMETER */);
}
int
@@ -313,7 +313,7 @@ Client::svc (void)
ami_test_var_->sendc_foo (the_handler_var_.in (),
number,
"Let's talk AMI."
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
if (debug)
diff --git a/TAO/tests/AMI/server.cpp b/TAO/tests/AMI/server.cpp
index da4274ab73f..44845b90c46 100644
--- a/TAO/tests/AMI/server.cpp
+++ b/TAO/tests/AMI/server.cpp
@@ -56,15 +56,15 @@ parse_args (int argc, char *argv[])
int
main (int argc, char *argv[])
{
- TAO_ENV_DECLARE_NEW_ENV;
+ ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
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 poa_object =
- orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+ orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (CORBA::is_nil (poa_object.in ()))
@@ -73,11 +73,11 @@ main (int argc, char *argv[])
1);
PortableServer::POA_var root_poa =
- PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+ PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+ root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
if (parse_args (argc, argv) != 0)
@@ -86,11 +86,11 @@ main (int argc, char *argv[])
AMI_Test_i ami_test_i (orb.in ());
A::AMI_Test_var ami_test_var =
- ami_test_i._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ ami_test_i._this (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
CORBA::String_var ior =
- orb->object_to_string (ami_test_var.in () TAO_ENV_ARG_PARAMETER);
+ orb->object_to_string (ami_test_var.in () ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -108,18 +108,18 @@ main (int argc, char *argv[])
ACE_OS::fclose (output_file);
}
- poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+ poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
- orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+ orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
root_poa->destroy (1, // ethernalize objects
0 // wait for completion
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+ orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
diff --git a/TAO/tests/AMI/simple_client.cpp b/TAO/tests/AMI/simple_client.cpp
index b203a92e2c7..c1081426714 100644
--- a/TAO/tests/AMI/simple_client.cpp
+++ b/TAO/tests/AMI/simple_client.cpp
@@ -83,7 +83,7 @@ public:
void foo (CORBA::Long ami_return_val,
CORBA::Long out_l
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (debug)
@@ -96,7 +96,7 @@ public:
};
void foo_excep (A::AMI_AMI_TestExceptionHolder * excep_holder
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
@@ -105,7 +105,7 @@ public:
"Testing proper exception handling ...\n"));
ACE_TRY
{
- excep_holder->raise_foo (TAO_ENV_SINGLE_ARG_PARAMETER);
+ excep_holder->raise_foo (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCH (A::DidTheRightThing, ex)
@@ -124,7 +124,7 @@ public:
void get_yadda (CORBA::Long result
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_DEBUG ((LM_DEBUG,
@@ -133,14 +133,14 @@ public:
};
void get_yadda_excep (A::AMI_AMI_TestExceptionHolder *
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_DEBUG ((LM_DEBUG,
"Callback method <get_yadda_excep> called: \n"));
};
- void set_yadda (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ void set_yadda (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_DEBUG ((LM_DEBUG,
@@ -148,7 +148,7 @@ public:
};
void set_yadda_excep (A::AMI_AMI_TestExceptionHolder *
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_DEBUG ((LM_DEBUG,
@@ -161,38 +161,38 @@ int
main (int argc, char *argv[])
{
- TAO_ENV_DECLARE_NEW_ENV;
+ ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
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_var =
- orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+ orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
PortableServer::POA_var poa_var =
- PortableServer::POA::_narrow (object_var.in () TAO_ENV_ARG_PARAMETER);
+ PortableServer::POA::_narrow (object_var.in () ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager_var =
- poa_var->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+ poa_var->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
- poa_manager_var->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+ poa_manager_var->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
if (parse_args (argc, argv) != 0)
return 1;
// We reuse the object_var smart pointer!
- object_var = orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+ object_var = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
A::AMI_Test_var ami_test_var =
- A::AMI_Test::_narrow (object_var.in () TAO_ENV_ARG_PARAMETER);
+ A::AMI_Test::_narrow (object_var.in () ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (CORBA::is_nil (ami_test_var.in ()))
@@ -206,7 +206,7 @@ main (int argc, char *argv[])
// Instantiate the ReplyHandler and register that with the POA.
Handler handler;
A::AMI_AMI_TestHandler_var the_handler_var =
- handler._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ handler._this (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
// Try out sending asynchronous messages without a reply handler
@@ -215,7 +215,7 @@ main (int argc, char *argv[])
ami_test_var->sendc_foo (A::AMI_AMI_TestHandler::_nil (),
0,
""
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
@@ -227,7 +227,7 @@ main (int argc, char *argv[])
ami_test_var->sendc_foo (the_handler_var.in (),
0,
"Let's talk AMI."
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
CORBA::Long l = 931247;
@@ -241,22 +241,22 @@ main (int argc, char *argv[])
ami_test_var->sendc_foo (the_handler_var.in (),
l,
"Let's talk AMI."
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
// Begin test of attributes
ami_test_var->sendc_get_yadda (the_handler_var.in ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
ami_test_var->sendc_set_yadda (the_handler_var.in (),
4711
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
ami_test_var->sendc_get_yadda (the_handler_var.in ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
// End test of attributes
@@ -281,7 +281,7 @@ main (int argc, char *argv[])
CORBA::Long number = ami_test_var->foo (l,
l,
"Let's talk SMI."
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (debug)
@@ -293,16 +293,16 @@ main (int argc, char *argv[])
if (shutdown_flag)
{
- ami_test_var->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+ ami_test_var->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
poa_var->destroy (1, // ethernalize objects
0 // wait for completion
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+ orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
View Lorry Controller Status