summaryrefslogtreecommitdiff
path: root/TAO/tests/Multiple/server.cpp
diff options
context:
space:
mode:
authorokellogg <okellogg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2002-01-29 20:21:11 +0000
committerokellogg <okellogg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2002-01-29 20:21:11 +0000
commit56681ffa90714cf82c32e907c0f80cea75166740 (patch)
treefd798ba5478a08b4b6f842cb8515ed9776861f5f /TAO/tests/Multiple/server.cpp
parent6b5e98c78a7f66029147fad41e2e75cea35854aa (diff)
downloadATCD-56681ffa90714cf82c32e907c0f80cea75166740.tar.gz
ChangeLogTag:Tue Jan 29 21:09:12 2002 Oliver Kellogg <oliver.kellogg@sysde.eads.net>
Diffstat (limited to 'TAO/tests/Multiple/server.cpp')
-rw-r--r--TAO/tests/Multiple/server.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/TAO/tests/Multiple/server.cpp b/TAO/tests/Multiple/server.cpp
index 403530d1b21..4bbaa563fac 100644
--- a/TAO/tests/Multiple/server.cpp
+++ b/TAO/tests/Multiple/server.cpp
@@ -7,24 +7,24 @@ ACE_RCSID (tests, server, "$Id$")
int main (int argc, char *argv[])
{
- TAO_ENV_DECLARE_NEW_ENV;
+ ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
// Orb Initialization
- CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "TAO" TAO_ENV_ARG_PARAMETER);
+ CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "TAO" ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
CORBA::Object_var object;
- object = orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+ object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- PortableServer::POA_var poa = PortableServer::POA::_narrow(object.in() TAO_ENV_ARG_PARAMETER);
+ PortableServer::POA_var poa = PortableServer::POA::_narrow(object.in() ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
// Get the POAManager
- PortableServer::POAManager_var poa_manager = poa->the_POAManager(TAO_ENV_SINGLE_ARG_PARAMETER);
+ PortableServer::POAManager_var poa_manager = poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
// Create the servant.
@@ -41,7 +41,7 @@ int main (int argc, char *argv[])
// Now we stringfy the object reference.
CORBA::String_var ior =
- orb->object_to_string (bottom.in () TAO_ENV_ARG_PARAMETER);
+ orb->object_to_string (bottom.in () ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -58,7 +58,7 @@ int main (int argc, char *argv[])
ACE_OS::fclose (output_file);
// Activate the POAManager
- poa_manager->activate(TAO_ENV_SINGLE_ARG_PARAMETER);
+ poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
orb->run();