summaryrefslogtreecommitdiff
path: root/TAO/tests/Faults
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tests/Faults')
-rw-r--r--TAO/tests/Faults/client.cpp30
-rw-r--r--TAO/tests/Faults/middle.cpp22
-rw-r--r--TAO/tests/Faults/ping.cpp32
-rw-r--r--TAO/tests/Faults/ping_i.cpp12
-rw-r--r--TAO/tests/Faults/ping_i.h8
-rw-r--r--TAO/tests/Faults/pong.cpp42
-rw-r--r--TAO/tests/Faults/server.cpp18
-rw-r--r--TAO/tests/Faults/test_i.cpp34
-rw-r--r--TAO/tests/Faults/test_i.h14
9 files changed, 106 insertions, 106 deletions
diff --git a/TAO/tests/Faults/client.cpp b/TAO/tests/Faults/client.cpp
index 0c2e85cca46..320a7e98043 100644
--- a/TAO/tests/Faults/client.cpp
+++ b/TAO/tests/Faults/client.cpp
@@ -71,11 +71,11 @@ main (int argc, char *argv[])
ACE_TRY_NEW_ENV
{
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 ()))
@@ -84,25 +84,25 @@ 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;
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;
Simple_Server_var server =
- Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+ Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (CORBA::is_nil (server.in ()))
@@ -116,14 +116,14 @@ main (int argc, char *argv[])
Callback_i callback_impl (orb.in ());
Callback_var callback =
- callback_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ callback_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
for (int i = 0; i != niterations; ++i)
{
CORBA::Long r =
server->test_method (0, 0, callback.in ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (r != 0)
@@ -138,7 +138,7 @@ main (int argc, char *argv[])
{
ACE_TRY_EX(ABORT)
{
- server->shutdown_now (0 TAO_ENV_ARG_PARAMETER);
+ server->shutdown_now (0 ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK_EX(ABORT);
}
ACE_CATCH (CORBA::COMM_FAILURE, comm_failure)
@@ -153,7 +153,7 @@ main (int argc, char *argv[])
{
ACE_TRY_EX(CRASH)
{
- server->shutdown_now (1 TAO_ENV_ARG_PARAMETER);
+ server->shutdown_now (1 ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK_EX(CRASH);
}
ACE_CATCH (CORBA::COMM_FAILURE, comm_failure)
@@ -167,24 +167,24 @@ main (int argc, char *argv[])
else if (do_suicide)
{
(void) server->test_method (1, 0, callback.in ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "ERROR: client should have aborted\n"));
}
else if (do_self_shutdown)
{
(void) server->test_method (1, 1, callback.in ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
if (do_shutdown)
{
- server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+ server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
- root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+ root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
diff --git a/TAO/tests/Faults/middle.cpp b/TAO/tests/Faults/middle.cpp
index 38d853b4cdb..5ffaeddbd26 100644
--- a/TAO/tests/Faults/middle.cpp
+++ b/TAO/tests/Faults/middle.cpp
@@ -51,11 +51,11 @@ main (int argc, char *argv[])
ACE_TRY_NEW_ENV
{
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 ()))
@@ -64,25 +64,25 @@ 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;
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;
Simple_Server_var server =
- Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+ Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (CORBA::is_nil (server.in ()))
@@ -97,11 +97,11 @@ main (int argc, char *argv[])
server.in ());
Simple_Server_var middle =
- middle_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ middle_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
CORBA::String_var ior =
- orb->object_to_string (middle.in () TAO_ENV_ARG_PARAMETER);
+ orb->object_to_string (middle.in () ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -119,12 +119,12 @@ main (int argc, char *argv[])
ACE_OS::fclose (output_file);
}
- orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+ orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
- root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+ root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
diff --git a/TAO/tests/Faults/ping.cpp b/TAO/tests/Faults/ping.cpp
index e3d5480d0a0..21d3b17c5bf 100644
--- a/TAO/tests/Faults/ping.cpp
+++ b/TAO/tests/Faults/ping.cpp
@@ -39,22 +39,22 @@ main (int argc, char *argv[])
ACE_TRY_NEW_ENV
{
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;
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;
// create child poa with PERSISTENT policy
@@ -63,24 +63,24 @@ main (int argc, char *argv[])
policies.length (2);
policies[0] =
root_poa->create_lifespan_policy(PortableServer::PERSISTENT
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
policies[1] =
root_poa->create_implicit_activation_policy(PortableServer::IMPLICIT_ACTIVATION
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
PortableServer::POA_var persistent_poa =
root_poa->create_POA("persistent",
poa_manager.in (),
policies
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- policies[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+ policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
- policies[1]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+ policies[1]->destroy (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;
if (parse_args (argc, argv) != 0)
@@ -90,11 +90,11 @@ main (int argc, char *argv[])
persistent_poa.in ());
PingObject_var server =
- server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
CORBA::String_var ior =
- orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
+ orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -112,15 +112,15 @@ main (int argc, char *argv[])
ACE_OS::fclose (output_file);
}
- orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+ orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
- persistent_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+ persistent_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+ root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
diff --git a/TAO/tests/Faults/ping_i.cpp b/TAO/tests/Faults/ping_i.cpp
index e8129cce447..c3526a74f73 100644
--- a/TAO/tests/Faults/ping_i.cpp
+++ b/TAO/tests/Faults/ping_i.cpp
@@ -10,27 +10,27 @@ ACE_RCSID(Faults, test_i, "$Id$")
void
PingObject_i::ping (PingObject_ptr callback
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- callback->pong (TAO_ENV_SINGLE_ARG_PARAMETER);
+ callback->pong (ACE_ENV_SINGLE_ARG_PARAMETER);
}
void
-PingObject_i::pong (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+PingObject_i::pong (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
}
void
-PingObject_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+PingObject_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+ this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
}
PortableServer::POA_ptr
-PingObject_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+PingObject_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return PortableServer::POA::_duplicate (this->poa_.in ());
diff --git a/TAO/tests/Faults/ping_i.h b/TAO/tests/Faults/ping_i.h
index 76ded91dcbf..d9a8dbab725 100644
--- a/TAO/tests/Faults/ping_i.h
+++ b/TAO/tests/Faults/ping_i.h
@@ -35,14 +35,14 @@ public:
// = The PingObject interface methods
void ping (PingObject_ptr callback
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- void pong (TAO_ENV_SINGLE_ARG_DECL)
+ void pong (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+ void shutdown (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL)
+ PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/TAO/tests/Faults/pong.cpp b/TAO/tests/Faults/pong.cpp
index 6165d7520c9..1a12c4acb14 100644
--- a/TAO/tests/Faults/pong.cpp
+++ b/TAO/tests/Faults/pong.cpp
@@ -56,7 +56,7 @@ void
run_client (CORBA::ORB_ptr orb,
PingObject_ptr server,
PingObject_ptr callback
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
{
// Run the client requests in a separate routine to isolate the
// exceptions...
@@ -68,11 +68,11 @@ run_client (CORBA::ORB_ptr orb,
ACE_TRY
{
reason = "Exception during ping call";
- server->ping (callback TAO_ENV_ARG_PARAMETER);
+ server->ping (callback ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
// Run for <period> milliseconds, to receive the reply
- orb->run (tv TAO_ENV_ARG_PARAMETER);
+ orb->run (tv ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
// Terminate the client if:
@@ -83,7 +83,7 @@ run_client (CORBA::ORB_ptr orb,
{
ACE_DEBUG ((LM_DEBUG, "Shutting down server\n"));
reason = "Exception during server shutdown";
- server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+ server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
}
@@ -115,22 +115,22 @@ main (int argc, char *argv[])
ACE_TRY_NEW_ENV
{
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;
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;
// create child poa with PERSISTENT policy
@@ -139,36 +139,36 @@ main (int argc, char *argv[])
policies.length (2);
policies[0] =
root_poa->create_lifespan_policy(PortableServer::PERSISTENT
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
policies[1] =
root_poa->create_implicit_activation_policy(PortableServer::IMPLICIT_ACTIVATION
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
PortableServer::POA_var persistent_poa =
root_poa->create_POA("persistent",
poa_manager.in (),
policies
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- policies[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+ policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
- policies[1]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+ policies[1]->destroy (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;
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;
PingObject_var server =
- PingObject::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+ PingObject::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (CORBA::is_nil (server.in ()))
@@ -183,7 +183,7 @@ main (int argc, char *argv[])
persistent_poa.in ());
PingObject_var callback =
- callback_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ callback_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
@@ -191,13 +191,13 @@ main (int argc, char *argv[])
run_client (orb.in (),
server.in (),
callback.in ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- persistent_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+ persistent_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+ root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
diff --git a/TAO/tests/Faults/server.cpp b/TAO/tests/Faults/server.cpp
index dc8742840fa..847423380a6 100644
--- a/TAO/tests/Faults/server.cpp
+++ b/TAO/tests/Faults/server.cpp
@@ -39,11 +39,11 @@ main (int argc, char *argv[])
ACE_TRY_NEW_ENV
{
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 ()))
@@ -52,14 +52,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;
if (parse_args (argc, argv) != 0)
@@ -76,11 +76,11 @@ main (int argc, char *argv[])
Simple_Server_var server =
- server_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ server_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
CORBA::String_var ior =
- orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
+ orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -98,12 +98,12 @@ main (int argc, char *argv[])
ACE_OS::fclose (output_file);
}
- orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+ orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
- root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+ root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
diff --git a/TAO/tests/Faults/test_i.cpp b/TAO/tests/Faults/test_i.cpp
index ac290b81b1a..d35a7f275f6 100644
--- a/TAO/tests/Faults/test_i.cpp
+++ b/TAO/tests/Faults/test_i.cpp
@@ -10,7 +10,7 @@ ACE_RCSID(Failure, test_i, "$Id$")
void
Callback_i::shutdown (CORBA::Boolean is_clean
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (is_clean == 0)
@@ -27,7 +27,7 @@ Callback_i::shutdown (CORBA::Boolean is_clean
return;
}
ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n"));
- this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+ this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
}
// ****************************************************************
@@ -36,14 +36,14 @@ CORBA::Long
Simple_Server_i::test_method (CORBA::Boolean do_callback,
CORBA::Boolean is_clean,
Callback_ptr callback
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (do_callback)
{
ACE_DEBUG ((LM_DEBUG, "Callback to shutdown client (%d)\n",
is_clean));
- callback->shutdown (is_clean TAO_ENV_ARG_PARAMETER);
+ callback->shutdown (is_clean ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
}
ACE_Time_Value tv (0, 20000);
@@ -53,7 +53,7 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback,
void
Simple_Server_i::shutdown_now (CORBA::Boolean is_clean
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (is_clean == 0)
@@ -68,14 +68,14 @@ Simple_Server_i::shutdown_now (CORBA::Boolean is_clean
}
ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n"));
- this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+ this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
}
void
-Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+ this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
}
// ****************************************************************
@@ -84,7 +84,7 @@ CORBA::Long
Middle_i::test_method (CORBA::Boolean do_callback,
CORBA::Boolean is_clean,
Callback_ptr callback
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
int i = 0;
@@ -93,14 +93,14 @@ Middle_i::test_method (CORBA::Boolean do_callback,
this->server_->test_method (0,
0,
callback
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
}
this->server_->test_method (do_callback,
is_clean,
callback
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
for (; i != 10; ++i)
@@ -108,7 +108,7 @@ Middle_i::test_method (CORBA::Boolean do_callback,
this->server_->test_method (0,
0,
callback
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
}
@@ -117,19 +117,19 @@ Middle_i::test_method (CORBA::Boolean do_callback,
void
Middle_i::shutdown_now (CORBA::Boolean is_clean
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- this->server_->shutdown_now (is_clean TAO_ENV_ARG_PARAMETER);
+ this->server_->shutdown_now (is_clean ACE_ENV_ARG_PARAMETER);
}
void
-Middle_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Middle_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TRY
{
- this->server_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+ this->server_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -138,5 +138,5 @@ Middle_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
}
ACE_ENDTRY;
- this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+ this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
}
diff --git a/TAO/tests/Faults/test_i.h b/TAO/tests/Faults/test_i.h
index 87335c1adb3..bad1f05f2af 100644
--- a/TAO/tests/Faults/test_i.h
+++ b/TAO/tests/Faults/test_i.h
@@ -34,7 +34,7 @@ public:
// ctor
void shutdown (CORBA::Boolean is_clean
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
// The callback method
@@ -59,14 +59,14 @@ public:
CORBA::Long test_method (CORBA::Boolean do_callback,
CORBA::Boolean is_clean,
Callback_ptr callback
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException));
void shutdown_now (CORBA::Boolean is_clean
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException));
- void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
@@ -91,14 +91,14 @@ public:
CORBA::Long test_method (CORBA::Boolean do_callback,
CORBA::Boolean is_clean,
Callback_ptr callback
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException));
void shutdown_now (CORBA::Boolean is_clean
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException));
- void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
View Lorry Controller Status