summaryrefslogtreecommitdiff
path: root/TAO/tests/LongUpcalls
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tests/LongUpcalls')
-rw-r--r--TAO/tests/LongUpcalls/AMI_Manager.cpp28
-rw-r--r--TAO/tests/LongUpcalls/AMI_Manager.h12
-rw-r--r--TAO/tests/LongUpcalls/Controller.cpp4
-rw-r--r--TAO/tests/LongUpcalls/Controller.h4
-rw-r--r--TAO/tests/LongUpcalls/Manager.cpp12
-rw-r--r--TAO/tests/LongUpcalls/Manager.h4
-rw-r--r--TAO/tests/LongUpcalls/Manager_Handler.cpp8
-rw-r--r--TAO/tests/LongUpcalls/Manager_Handler.h4
-rw-r--r--TAO/tests/LongUpcalls/ami_client.cpp28
-rw-r--r--TAO/tests/LongUpcalls/ami_server.cpp20
-rw-r--r--TAO/tests/LongUpcalls/blocking_client.cpp24
-rw-r--r--TAO/tests/LongUpcalls/blocking_server.cpp20
12 files changed, 84 insertions, 84 deletions
diff --git a/TAO/tests/LongUpcalls/AMI_Manager.cpp b/TAO/tests/LongUpcalls/AMI_Manager.cpp
index 712ed680558..6ca6f72ef38 100644
--- a/TAO/tests/LongUpcalls/AMI_Manager.cpp
+++ b/TAO/tests/LongUpcalls/AMI_Manager.cpp
@@ -15,7 +15,7 @@ void
AMI_Manager::start_workers (CORBA::Short worker_count,
CORBA::Long milliseconds,
Test::Controller_ptr controller
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_Thread_Manager thread_manager;
@@ -31,10 +31,10 @@ AMI_Manager::start_workers (CORBA::Short worker_count,
}
void
-AMI_Manager::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+AMI_Manager::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);
}
// ****************************************************************
@@ -54,7 +54,7 @@ int
Worker::svc (void)
{
// ACE_DEBUG ((LM_DEBUG, "Worker starts\n"));
- TAO_ENV_DECLARE_NEW_ENV;
+ ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
TAO_SYNCH_MUTEX mutex;
@@ -69,11 +69,11 @@ Worker::svc (void)
-1);
PortableServer::ServantBase_var auto_destroy (handler_impl);
- handler = handler_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ handler = handler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
this->controller_->sendc_worker_started (handler.in ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
// ACE_DEBUG ((LM_DEBUG, "Worker start reported\n"));
@@ -82,7 +82,7 @@ Worker::svc (void)
ACE_OS::sleep (tv);
this->controller_->sendc_worker_finished (handler.in ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
// ACE_DEBUG ((LM_DEBUG, "Worker completion reported\n"));
@@ -90,7 +90,7 @@ Worker::svc (void)
for (;;)
{
ACE_Time_Value tv (0, 1000 * this->milliseconds_);
- this->orb_->run (tv TAO_ENV_ARG_PARAMETER);
+ this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, mutex, -1);
@@ -117,7 +117,7 @@ Controller_Handler::Controller_Handler (TAO_SYNCH_MUTEX *mutex,
}
void
-Controller_Handler::worker_started (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Controller_Handler::worker_started (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *this->mutex_);
@@ -127,12 +127,12 @@ Controller_Handler::worker_started (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
void
Controller_Handler::worker_started_excep
(Test::AMI_ControllerExceptionHolder* h
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TRY
{
- h->raise_worker_started (TAO_ENV_SINGLE_ARG_PARAMETER);
+ h->raise_worker_started (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -145,7 +145,7 @@ Controller_Handler::worker_started_excep
}
void
-Controller_Handler::worker_finished (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Controller_Handler::worker_finished (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *this->mutex_);
@@ -155,12 +155,12 @@ Controller_Handler::worker_finished (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
void
Controller_Handler::worker_finished_excep
(Test::AMI_ControllerExceptionHolder *h
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TRY
{
- h->raise_worker_finished (TAO_ENV_SINGLE_ARG_PARAMETER);
+ h->raise_worker_finished (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
diff --git a/TAO/tests/LongUpcalls/AMI_Manager.h b/TAO/tests/LongUpcalls/AMI_Manager.h
index 84ca8247dd5..a351e61d38d 100644
--- a/TAO/tests/LongUpcalls/AMI_Manager.h
+++ b/TAO/tests/LongUpcalls/AMI_Manager.h
@@ -25,9 +25,9 @@ public:
virtual void start_workers (CORBA::Short worker_count,
CORBA::Long milliseconds,
Test::Controller_ptr controller
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+ virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
@@ -70,15 +70,15 @@ public:
int *pending_replies);
// Constructor
- virtual void worker_started (TAO_ENV_SINGLE_ARG_DECL)
+ virtual void worker_started (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void worker_started_excep (Test::AMI_ControllerExceptionHolder*
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void worker_finished (TAO_ENV_SINGLE_ARG_DECL)
+ virtual void worker_finished (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void worker_finished_excep (Test::AMI_ControllerExceptionHolder*
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/TAO/tests/LongUpcalls/Controller.cpp b/TAO/tests/LongUpcalls/Controller.cpp
index 2485ce0489f..94008f0a364 100644
--- a/TAO/tests/LongUpcalls/Controller.cpp
+++ b/TAO/tests/LongUpcalls/Controller.cpp
@@ -24,7 +24,7 @@ Controller::dump_results ()
}
void
-Controller::worker_started (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Controller::worker_started (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
@@ -34,7 +34,7 @@ Controller::worker_started (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
}
void
-Controller::worker_finished (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Controller::worker_finished (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
diff --git a/TAO/tests/LongUpcalls/Controller.h b/TAO/tests/LongUpcalls/Controller.h
index 1ab48e7c104..47587760e7f 100644
--- a/TAO/tests/LongUpcalls/Controller.h
+++ b/TAO/tests/LongUpcalls/Controller.h
@@ -24,9 +24,9 @@ public:
// Print out the results and any errors
// = The skeleton methods
- virtual void worker_started (TAO_ENV_SINGLE_ARG_DECL)
+ virtual void worker_started (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void worker_finished (TAO_ENV_SINGLE_ARG_DECL)
+ virtual void worker_finished (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/TAO/tests/LongUpcalls/Manager.cpp b/TAO/tests/LongUpcalls/Manager.cpp
index b9b9a2d1685..6151d64e7c6 100644
--- a/TAO/tests/LongUpcalls/Manager.cpp
+++ b/TAO/tests/LongUpcalls/Manager.cpp
@@ -15,7 +15,7 @@ void
Manager::start_workers (CORBA::Short worker_count,
CORBA::Long milliseconds,
Test::Controller_ptr controller
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_Thread_Manager thread_manager;
@@ -30,10 +30,10 @@ Manager::start_workers (CORBA::Short worker_count,
}
void
-Manager::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Manager::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);
}
@@ -52,10 +52,10 @@ int
Worker::svc (void)
{
// ACE_DEBUG ((LM_DEBUG, "Worker starts\n"));
- TAO_ENV_DECLARE_NEW_ENV;
+ ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
- this->controller_->worker_started (TAO_ENV_SINGLE_ARG_PARAMETER);
+ this->controller_->worker_started (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
// ACE_DEBUG ((LM_DEBUG, "Worker start reported\n"));
@@ -63,7 +63,7 @@ Worker::svc (void)
ACE_Time_Value tv (0, 1000 * this->milliseconds_);
ACE_OS::sleep (tv);
- this->controller_->worker_finished (TAO_ENV_SINGLE_ARG_PARAMETER);
+ this->controller_->worker_finished (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
// ACE_DEBUG ((LM_DEBUG, "Worker completion reported\n"));
diff --git a/TAO/tests/LongUpcalls/Manager.h b/TAO/tests/LongUpcalls/Manager.h
index 31cf037ced8..9a73fac67ba 100644
--- a/TAO/tests/LongUpcalls/Manager.h
+++ b/TAO/tests/LongUpcalls/Manager.h
@@ -27,9 +27,9 @@ public:
virtual void start_workers (CORBA::Short worker_count,
CORBA::Long milliseconds,
Test::Controller_ptr controller
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
- virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+ virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/TAO/tests/LongUpcalls/Manager_Handler.cpp b/TAO/tests/LongUpcalls/Manager_Handler.cpp
index a4ed57650f7..4223798dc86 100644
--- a/TAO/tests/LongUpcalls/Manager_Handler.cpp
+++ b/TAO/tests/LongUpcalls/Manager_Handler.cpp
@@ -14,7 +14,7 @@ Manager_Handler::Manager_Handler (Test::Manager_ptr manager,
}
void
-Manager_Handler::start_workers (TAO_ENV_SINGLE_ARG_DECL)
+Manager_Handler::start_workers (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TRY
@@ -22,7 +22,7 @@ Manager_Handler::start_workers (TAO_ENV_SINGLE_ARG_DECL)
this->manager_->start_workers (CORBA::Short(10),
CORBA::Long(1000),
this->controller_.in ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
@@ -35,12 +35,12 @@ Manager_Handler::start_workers (TAO_ENV_SINGLE_ARG_DECL)
void
Manager_Handler::start_workers_excep (Test::AMI_ManagerExceptionHolder * holder
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TRY
{
- holder->raise_start_workers (TAO_ENV_SINGLE_ARG_PARAMETER);
+ holder->raise_start_workers (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
diff --git a/TAO/tests/LongUpcalls/Manager_Handler.h b/TAO/tests/LongUpcalls/Manager_Handler.h
index bc489e678b1..7ead1579196 100644
--- a/TAO/tests/LongUpcalls/Manager_Handler.h
+++ b/TAO/tests/LongUpcalls/Manager_Handler.h
@@ -25,10 +25,10 @@ public:
// Constructor
// = The skeleton methods
- virtual void start_workers (TAO_ENV_SINGLE_ARG_DECL)
+ virtual void start_workers (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void start_workers_excep (Test::AMI_ManagerExceptionHolder*
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
private:
diff --git a/TAO/tests/LongUpcalls/ami_client.cpp b/TAO/tests/LongUpcalls/ami_client.cpp
index 997c8871d2f..e22153a203d 100644
--- a/TAO/tests/LongUpcalls/ami_client.cpp
+++ b/TAO/tests/LongUpcalls/ami_client.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 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 (object.in ()))
@@ -52,11 +52,11 @@ main (int argc, char *argv[])
1);
PortableServer::POA_var root_poa =
- PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+ PortableServer::POA::_narrow (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)
@@ -65,14 +65,14 @@ main (int argc, char *argv[])
Controller controller_impl;
Test::Controller_var controller =
- controller_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ controller_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
- object = orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+ object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
Test::Manager_var manager =
- Test::Manager::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+ Test::Manager::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (CORBA::is_nil (manager.in ()))
@@ -83,10 +83,10 @@ main (int argc, char *argv[])
Manager_Handler handler_impl (manager.in (),
controller.in ());
Test::AMI_ManagerHandler_var handler =
- handler_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ handler_impl._this (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;
const CORBA::Short worker_count = 10;
@@ -94,22 +94,22 @@ main (int argc, char *argv[])
worker_count,
CORBA::Long (1000),
controller.in ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
ACE_Time_Value tv (30, 0);
- orb->run (tv TAO_ENV_ARG_PARAMETER);
+ orb->run (tv ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
controller_impl.dump_results ();
- manager->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+ manager->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;
- orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+ orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
diff --git a/TAO/tests/LongUpcalls/ami_server.cpp b/TAO/tests/LongUpcalls/ami_server.cpp
index 188afbd32d1..ed7307129f9 100644
--- a/TAO/tests/LongUpcalls/ami_server.cpp
+++ b/TAO/tests/LongUpcalls/ami_server.cpp
@@ -38,11 +38,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 ()))
@@ -51,11 +51,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)
@@ -64,11 +64,11 @@ main (int argc, char *argv[])
AMI_Manager manager_impl (orb.in ());
Test::Manager_var manager =
- manager_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ manager_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
CORBA::String_var ior =
- orb->object_to_string (manager.in () TAO_ENV_ARG_PARAMETER);
+ orb->object_to_string (manager.in () ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
// If the ior_output_file exists, output the ior to it
@@ -81,18 +81,18 @@ main (int argc, char *argv[])
ACE_OS::fprintf (output_file, "%s", ior.in ());
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;
// 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;
- orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+ orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
diff --git a/TAO/tests/LongUpcalls/blocking_client.cpp b/TAO/tests/LongUpcalls/blocking_client.cpp
index b1e6cfa917a..b914c957950 100644
--- a/TAO/tests/LongUpcalls/blocking_client.cpp
+++ b/TAO/tests/LongUpcalls/blocking_client.cpp
@@ -38,11 +38,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 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 (object.in ()))
@@ -51,11 +51,11 @@ main (int argc, char *argv[])
1);
PortableServer::POA_var root_poa =
- PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+ PortableServer::POA::_narrow (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)
@@ -64,14 +64,14 @@ main (int argc, char *argv[])
Controller controller_impl;
Test::Controller_var controller =
- controller_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ controller_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
- object = orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+ object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
Test::Manager_var manager =
- Test::Manager::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+ Test::Manager::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
if (CORBA::is_nil (manager.in ()))
@@ -80,25 +80,25 @@ main (int argc, char *argv[])
1);
- poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+ poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
const CORBA::Short worker_count = 10;
manager->start_workers (worker_count,
CORBA::Long (1000),
controller.in ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
controller_impl.dump_results ();
- manager->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+ manager->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;
- orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+ orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
diff --git a/TAO/tests/LongUpcalls/blocking_server.cpp b/TAO/tests/LongUpcalls/blocking_server.cpp
index 1c43c2468cc..eb5c55c3bf0 100644
--- a/TAO/tests/LongUpcalls/blocking_server.cpp
+++ b/TAO/tests/LongUpcalls/blocking_server.cpp
@@ -38,11 +38,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 ()))
@@ -51,11 +51,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)
@@ -64,11 +64,11 @@ main (int argc, char *argv[])
Manager manager_impl (orb.in ());
Test::Manager_var manager =
- manager_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ manager_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
CORBA::String_var ior =
- orb->object_to_string (manager.in () TAO_ENV_ARG_PARAMETER);
+ orb->object_to_string (manager.in () ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
// If the ior_output_file exists, output the ior to it
@@ -81,18 +81,18 @@ main (int argc, char *argv[])
ACE_OS::fprintf (output_file, "%s", ior.in ());
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;
// 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;
- orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+ orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
ACE_CATCHANY
View Lorry Controller Status