diff options
Diffstat (limited to 'TAO/tests/ORB_init')
| -rw-r--r-- | TAO/tests/ORB_init/ORB_init.cpp | 20 | ||||
| -rw-r--r-- | TAO/tests/ORB_init/Portspan/server.cpp | 14 | ||||
| -rw-r--r-- | TAO/tests/ORB_init/Portspan/simpleI.cpp | 2 | ||||
| -rw-r--r-- | TAO/tests/ORB_init/Portspan/simpleI.h | 2 |
4 files changed, 19 insertions, 19 deletions
diff --git a/TAO/tests/ORB_init/ORB_init.cpp b/TAO/tests/ORB_init/ORB_init.cpp index 77814057eb1..7ffb4d68189 100644 --- a/TAO/tests/ORB_init/ORB_init.cpp +++ b/TAO/tests/ORB_init/ORB_init.cpp @@ -17,7 +17,7 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { const char orbid[] = "mighty_orb"; @@ -25,7 +25,7 @@ main (int argc, char *argv[]) CORBA::ORB_ptr my_orb = CORBA::ORB::_nil(); { - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, orbid TAO_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, orbid ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; my_orb = orb.in (); @@ -42,7 +42,7 @@ main (int argc, char *argv[]) // used in that scope. // ------------------------------------------------------------- - orb = CORBA::ORB_init (argc, argv, orbid TAO_ENV_ARG_PARAMETER); + orb = CORBA::ORB_init (argc, argv, orbid ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // This isn't portable, but TAO implements an ORB_ptr as a @@ -77,10 +77,10 @@ main (int argc, char *argv[]) // attempt to initialize a new ORB with the same ORBid. // ------------------------------------------------------------- - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb = CORBA::ORB_init (argc, argv, orbid TAO_ENV_ARG_PARAMETER); + orb = CORBA::ORB_init (argc, argv, orbid ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // This isn't portable, but TAO implements an ORB_ptr as a @@ -116,7 +116,7 @@ main (int argc, char *argv[]) // ------------------------------------------------------------- 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; // ------------------------------------------------------------- @@ -125,11 +125,11 @@ main (int argc, char *argv[]) // clean-up. // ------------------------------------------------------------- CORBA::ORB_var orb2 = - CORBA::ORB_init (argc, argv, "ORB number 2" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "ORB number 2" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ORB_var orb3 = - CORBA::ORB_init (argc, argv, "ORB number 3" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "ORB number 3" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // ------------------------------------------------------------- @@ -139,11 +139,11 @@ main (int argc, char *argv[]) // ORB itself break when the last ORB is released. // ------------------------------------------------------------- - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If we get here, then something went wrong. A diff --git a/TAO/tests/ORB_init/Portspan/server.cpp b/TAO/tests/ORB_init/Portspan/server.cpp index 1c3be70c827..e93543879ed 100644 --- a/TAO/tests/ORB_init/Portspan/server.cpp +++ b/TAO/tests/ORB_init/Portspan/server.cpp @@ -9,30 +9,30 @@ main( int argc, char *argv[] ) { CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj = orb->resolve_initial_references("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = PortableServer::POA::_narrow(obj.in() - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - PortableServer::POAManager_var man = poa->the_POAManager(TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POAManager_var man = poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - man->activate(TAO_ENV_SINGLE_ARG_PARAMETER); + man->activate(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; simple_i simp; PortableServer::ObjectId_var objId = poa->activate_object(&simp - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run(TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/tests/ORB_init/Portspan/simpleI.cpp b/TAO/tests/ORB_init/Portspan/simpleI.cpp index 6e7d6a4dd69..6a7620307a6 100644 --- a/TAO/tests/ORB_init/Portspan/simpleI.cpp +++ b/TAO/tests/ORB_init/Portspan/simpleI.cpp @@ -32,7 +32,7 @@ simple_i::~simple_i (void) } void simple_i::test ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException diff --git a/TAO/tests/ORB_init/Portspan/simpleI.h b/TAO/tests/ORB_init/Portspan/simpleI.h index 6cf337231f1..23faf5eb717 100644 --- a/TAO/tests/ORB_init/Portspan/simpleI.h +++ b/TAO/tests/ORB_init/Portspan/simpleI.h @@ -39,7 +39,7 @@ public: virtual ~simple_i (void); virtual void test ( - TAO_ENV_SINGLE_ARG_DECL + ACE_ENV_SINGLE_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException |