diff options
Diffstat (limited to 'TAO/tests/NestedUpcall')
25 files changed, 131 insertions, 131 deletions
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp index 14d564729cf..c9037a1145b 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp @@ -38,7 +38,7 @@ MT_Object_i::~MT_Object_i (void) CORBA::Long MT_Object_i::yadda (CORBA::Long hop_count, MT_Object_ptr partner - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -49,8 +49,8 @@ MT_Object_i::yadda (CORBA::Long hop_count, { if (partner != 0) return partner->yadda (hop_count + 1, - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER) - TAO_ENV_ARG_PARAMETER) + 1; + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER) + ACE_ENV_ARG_PARAMETER) + 1; } return 0; diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h index ccfad73f3ab..de5d9893297 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h +++ b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h @@ -37,7 +37,7 @@ public: virtual CORBA::Long yadda (CORBA::Long hop_count, MT_Object_ptr partner - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp index 61eef4524e8..ad0435e280a 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp @@ -146,7 +146,7 @@ MT_Client::parse_args (void) int MT_Client::run (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { for (unsigned long i = 0; i < this->iterations_; i++) @@ -160,7 +160,7 @@ MT_Client::run (void) // testing this->mT_Object_var_->yadda (0, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -198,7 +198,7 @@ MT_Client::init (int argc, char **argv, this->client_number_ = client_number; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { char buf[64]; @@ -208,7 +208,7 @@ MT_Client::init (int argc, char **argv, CORBA::ORB_init (this->argc_, this->argv_, buf - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse command line and verify parameters. @@ -223,7 +223,7 @@ MT_Client::init (int argc, char **argv, CORBA::Object_var object_var = this->orb_var_->string_to_object (this->object_key_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (object_var.in())) @@ -232,7 +232,7 @@ MT_Client::init (int argc, char **argv, -1); this->mT_Object_var_ = MT_Object::_narrow (object_var.in() - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (this->mT_Object_var_.in())) @@ -246,7 +246,7 @@ MT_Client::init (int argc, char **argv, ACE_DEBUG ((LM_DEBUG, "We have a proper reference to the Object.\n")); CORBA::Object_var poa_object = - this->orb_var_->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + this->orb_var_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -255,14 +255,14 @@ MT_Client::init (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; } ACE_CATCHANY @@ -282,14 +282,14 @@ MT_Client::init (int argc, char **argv, int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { TAO_ORB_Manager orb_manager; int r = orb_manager.init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (r != 0) diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp index fff693f2e46..6f83e38af9f 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp @@ -142,7 +142,7 @@ MT_Server::init (int argc, "MT_Server::init: ORB_Manager is nil!\n"), -1); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Call the init of TAO_ORB_Manager to create a child POA @@ -150,7 +150,7 @@ MT_Server::init (int argc, this->orb_manager_ptr_->init_child_poa (argc, argv, "child_poa" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -160,7 +160,7 @@ MT_Server::init (int argc, this->str_ = this->orb_manager_ptr_->activate_under_child_poa ("MT", &this->mT_Object_i_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -185,7 +185,7 @@ MT_Server::init (int argc, CORBA::Object_var object_var = orb_var->string_to_object (this->object_key_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (object_var.in())) @@ -194,7 +194,7 @@ MT_Server::init (int argc, -1); this->mT_Object_var_ = MT_Object::_narrow (object_var.in() - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (this->mT_Object_var_.in())) @@ -220,10 +220,10 @@ MT_Server::init (int argc, int MT_Server::run () { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - int r = this->orb_manager_ptr_->run (TAO_ENV_SINGLE_ARG_PARAMETER); + int r = this->orb_manager_ptr_->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (r == -1) @@ -245,12 +245,12 @@ MT_Server::~MT_Server (void) if (this->object_key_ != 0) ACE_OS::free (this->object_key_); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { if (this->orb_manager_ptr_) this->orb_manager_ptr_->deactivate_under_child_poa (this->str_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -266,7 +266,7 @@ MT_Server::run_ORB_briefly (void) { if (this->iterations_ > 0) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { ACE_DEBUG ((LM_DEBUG, @@ -276,12 +276,12 @@ MT_Server::run_ORB_briefly (void) for (unsigned int i = 0; i < this->iterations_; i++) { MT_Object_var tmp = - this->mT_Object_i_._this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->mT_Object_i_._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->mT_Object_var_->yadda (0, tmp.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp index a259d0c2f74..2fe47240f78 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp @@ -64,14 +64,14 @@ MT_Object_Server::parse_args (void) int MT_Object_Server::init (int argc, char** argv - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Call the init of TAO_ORB_Manager to create a child POA // under the root POA. this->orb_manager_.init_child_poa (argc, argv, "child_poa" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->argc_ = argc; @@ -83,7 +83,7 @@ MT_Object_Server::init (int argc, CORBA::String_var str; str = this->orb_manager_.activate_under_child_poa ("MT_Object", &this->mT_Object_i_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, @@ -104,9 +104,9 @@ MT_Object_Server::init (int argc, int -MT_Object_Server::run (TAO_ENV_SINGLE_ARG_DECL) +MT_Object_Server::run (ACE_ENV_SINGLE_ARG_DECL) { - if (this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER) == -1) + if (this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER) == -1) ACE_ERROR_RETURN ((LM_ERROR, "NestedUpCalls_Server::run"), -1); @@ -125,17 +125,17 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "\n \t NestedUpCalls.Triangle_Test: Object A Server \n \n")); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - int r = MT_Object_Server.init (argc,argv TAO_ENV_ARG_PARAMETER); + int r = MT_Object_Server.init (argc,argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (r == -1) return 1; else { - MT_Object_Server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + MT_Object_Server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.h b/TAO/tests/NestedUpcall/MT_Client_Test/server.h index b8d72823b9e..0ae8e9d6633 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/server.h +++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.h @@ -49,10 +49,10 @@ public: int init (int argc, char **argv - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize the NestedUpCalls_Server state - parsing arguments and ... - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the orb private: diff --git a/TAO/tests/NestedUpcall/Simple/client.cpp b/TAO/tests/NestedUpcall/Simple/client.cpp index 63e789b52b3..33dc4890f6a 100644 --- a/TAO/tests/NestedUpcall/Simple/client.cpp +++ b/TAO/tests/NestedUpcall/Simple/client.cpp @@ -50,7 +50,7 @@ Client_Task::svc (void) // Now, we can invoke an operation on the remote side. this->server_->start (this->client_.in (), call_count - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -121,7 +121,7 @@ main (int argc, CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = parse_args (argc, @@ -130,34 +130,34 @@ main (int argc, return result; CORBA::Object_var object = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + 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; object = orb->string_to_object (ior - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; server_var server = server::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create an client object to hand to the other side... client_i client_servant (quiet, server.in ()); - client_var client_object = client_servant._this (TAO_ENV_SINGLE_ARG_PARAMETER); + client_var client_object = client_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Client_Task client_tasks (client_object.in (), @@ -167,13 +167,13 @@ main (int argc, if (shutdown_server) { - 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); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/NestedUpcall/Simple/client_i.cpp b/TAO/tests/NestedUpcall/Simple/client_i.cpp index 3e1d975fb28..af61f40ba94 100644 --- a/TAO/tests/NestedUpcall/Simple/client_i.cpp +++ b/TAO/tests/NestedUpcall/Simple/client_i.cpp @@ -11,7 +11,7 @@ client_i::client_i (int quiet, void client_i::ping (CORBA::UShort time_to_live - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (!this->quiet_) @@ -24,7 +24,7 @@ client_i::ping (CORBA::UShort time_to_live if (time_to_live > 0) { this->server_->ping (time_to_live - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } diff --git a/TAO/tests/NestedUpcall/Simple/client_i.h b/TAO/tests/NestedUpcall/Simple/client_i.h index d384e305791..c90a070e907 100644 --- a/TAO/tests/NestedUpcall/Simple/client_i.h +++ b/TAO/tests/NestedUpcall/Simple/client_i.h @@ -10,7 +10,7 @@ public: // Constructor. void ping (CORBA::UShort time_to_live - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/NestedUpcall/Simple/server.cpp b/TAO/tests/NestedUpcall/Simple/server.cpp index 75312958193..59b29310415 100644 --- a/TAO/tests/NestedUpcall/Simple/server.cpp +++ b/TAO/tests/NestedUpcall/Simple/server.cpp @@ -33,10 +33,10 @@ Server_Task::Server_Task (CORBA::ORB_ptr orb) int Server_Task::svc (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -121,7 +121,7 @@ main (int argc, CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = parse_args (argc, @@ -130,29 +130,29 @@ main (int argc, return result; CORBA::Object_var object = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + 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; server_i server_servant (quiet, orb.in ()); - server_var server_object = server_servant._this (TAO_ENV_SINGLE_ARG_PARAMETER); + server_var server_object = server_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = orb->object_to_string (server_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; result = write_ior_to_file (ior.in ()); @@ -174,7 +174,7 @@ main (int argc, root_poa->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/NestedUpcall/Simple/server_i.cpp b/TAO/tests/NestedUpcall/Simple/server_i.cpp index 9bf81230998..6e6a9b7ade4 100644 --- a/TAO/tests/NestedUpcall/Simple/server_i.cpp +++ b/TAO/tests/NestedUpcall/Simple/server_i.cpp @@ -12,12 +12,12 @@ server_i::server_i (int quiet, void server_i::start (client_ptr c, CORBA::UShort time_to_live - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { this->client_ = client::_duplicate (c); this->ping (time_to_live - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; return; @@ -25,7 +25,7 @@ server_i::start (client_ptr c, void server_i::ping (CORBA::UShort time_to_live - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (!this->quiet_) @@ -38,16 +38,16 @@ server_i::ping (CORBA::UShort time_to_live if (time_to_live > 0) { this->client_->ping (time_to_live - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } void -server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/tests/NestedUpcall/Simple/server_i.h b/TAO/tests/NestedUpcall/Simple/server_i.h index 805606b8a32..a92ecc85d08 100644 --- a/TAO/tests/NestedUpcall/Simple/server_i.h +++ b/TAO/tests/NestedUpcall/Simple/server_i.h @@ -9,15 +9,15 @@ public: CORBA::ORB_ptr orb); void ping (CORBA::UShort time_to_live - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); void start (client_ptr c, CORBA::UShort time_to_live - TAO_ENV_ARG_DECL) + ACE_ENV_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)); private: diff --git a/TAO/tests/NestedUpcall/Simple/simple-client.cpp b/TAO/tests/NestedUpcall/Simple/simple-client.cpp index ed8c279cd01..a014035dc5e 100644 --- a/TAO/tests/NestedUpcall/Simple/simple-client.cpp +++ b/TAO/tests/NestedUpcall/Simple/simple-client.cpp @@ -53,7 +53,7 @@ Client_Task::svc (void) // Now, we can invoke an operation on the remote side. this->server_->start (this->client_.in (), call_count - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; return 0; @@ -130,7 +130,7 @@ main (int argc, CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = parse_args (argc, @@ -139,34 +139,34 @@ main (int argc, return result; CORBA::Object_var object = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + 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; object = orb->string_to_object (ior - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; server_var server = server::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create an client object to hand to the other side... client_i client_servant (quiet, server.in ()); - client_var client_object = client_servant._this (TAO_ENV_SINGLE_ARG_PARAMETER); + client_var client_object = client_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Client_Task client_tasks (client_object.in (), @@ -177,13 +177,13 @@ main (int argc, if (shutdown_server) { - 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); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp index 67053270013..2b525bac4ea 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp @@ -36,7 +36,7 @@ Initiator_i::~Initiator_i (void) } void -Initiator_i::foo_object_B (TAO_ENV_SINGLE_ARG_DECL) +Initiator_i::foo_object_B (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -45,7 +45,7 @@ Initiator_i::foo_object_B (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY { this->object_B_var_->foo (this->object_A_var_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) Initiator_i::foo_object_B: Returned from call.\n")); diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h index ab5133bbb28..50f01bf658f 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h @@ -35,7 +35,7 @@ public: virtual ~Initiator_i (void); // Destructor. - virtual void foo_object_B (TAO_ENV_SINGLE_ARG_DECL) + virtual void foo_object_B (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp index ec7adc6c3f4..f113dd6e48a 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp @@ -39,7 +39,7 @@ Object_A_i::~Object_A_i (void) void Object_A_i::foo (Initiator_ptr theInitiator_ptr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -47,7 +47,7 @@ Object_A_i::foo (Initiator_ptr theInitiator_ptr ACE_TRY { - theInitiator_ptr->foo_object_B (TAO_ENV_SINGLE_ARG_PARAMETER); + theInitiator_ptr->foo_object_B (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; while (!this->finish_two_way_call_) @@ -64,7 +64,7 @@ Object_A_i::foo (Initiator_ptr theInitiator_ptr } void -Object_A_i::finish (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Object_A_i::finish (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h index 6831a81039b..83c771f5a6f 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h @@ -35,10 +35,10 @@ public: // Destructor. virtual void foo (Initiator_ptr theInitiator_ptr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void finish (TAO_ENV_SINGLE_ARG_DECL) + virtual void finish (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); unsigned long finish_two_way_call_; diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp index 94654d06bd5..2373ce9b400 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp @@ -36,7 +36,7 @@ Object_B_i::~Object_B_i (void) void Object_B_i::foo (Object_A_ptr theObject_A_ptr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -48,7 +48,7 @@ Object_B_i::foo (Object_A_ptr theObject_A_ptr ACE_DEBUG ((LM_DEBUG, "(%P|%t) BEGIN Object_B_i::foo: Trying to call Object A\n")); - theObject_A_ptr->finish (TAO_ENV_SINGLE_ARG_PARAMETER); + theObject_A_ptr->finish (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Start to wait on this variable, it is set to true diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h index d4468a9372c..c76b4d2ab80 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h @@ -35,7 +35,7 @@ public: // Destructor. virtual void foo(Object_A_ptr theObject_A_ptr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp index 78bb62a8a1b..e4011a3a2e5 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp @@ -120,14 +120,14 @@ Initiator_Server::parse_args (void) int Initiator_Server::init (int argc, char** argv - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Call the init of TAO_ORB_Manager to create a child POA // under the root POA. this->orb_manager_.init_child_poa (argc, argv, "child_poa" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->argc_ = argc; @@ -148,11 +148,11 @@ Initiator_Server::init (int argc, CORBA::Object_var object_A_obj_var = this->orb_manager_.orb()->string_to_object (this->object_A_key_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->object_A_var_ = - Object_A::_narrow (object_A_obj_var.in() TAO_ENV_ARG_PARAMETER); + Object_A::_narrow (object_A_obj_var.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (this->object_A_var_.in ())) @@ -170,11 +170,11 @@ Initiator_Server::init (int argc, CORBA::Object_var object_B_obj_var = this->orb_manager_.orb()->string_to_object (this->object_B_key_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->object_B_var_ = - Object_B::_narrow (object_B_obj_var.in() TAO_ENV_ARG_PARAMETER); + Object_B::_narrow (object_B_obj_var.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (this->object_B_var_.in ())) @@ -188,7 +188,7 @@ Initiator_Server::init (int argc, this->object_A_key_)); ACE_DEBUG ((LM_DEBUG, "Object B received OK\n")); - this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) @@ -210,7 +210,7 @@ Initiator_Server::init (int argc, this->str_ = this->orb_manager_.activate (this->initiator_i_ptr_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_DEBUG ((LM_DEBUG, "The IOR is: <%s>\n", this->str_.in ())); @@ -221,7 +221,7 @@ Initiator_Server::init (int argc, int -Initiator_Server::run (TAO_ENV_SINGLE_ARG_DECL) +Initiator_Server::run (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { @@ -230,10 +230,10 @@ Initiator_Server::run (TAO_ENV_SINGLE_ARG_DECL) "foo on Object A\n")); Initiator_var initiator = - this->initiator_i_ptr_->_this(TAO_ENV_SINGLE_ARG_PARAMETER); + this->initiator_i_ptr_->_this(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - this->object_A_var_->foo (initiator.in () TAO_ENV_ARG_PARAMETER); + this->object_A_var_->foo (initiator.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Initiator_Server::run: Returned from invoke " @@ -261,11 +261,11 @@ Initiator_Server::~Initiator_Server (void) if (this->object_B_key_ != 0) ACE_OS::free (this->object_B_key_); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { this->orb_manager_.deactivate (this->str_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -285,18 +285,18 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "\n \t NestedUpCalls.Triangle_Test: Initiator Server \n \n")); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { int retval = - initiator_Server.init (argc, argv TAO_ENV_ARG_PARAMETER); + initiator_Server.init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (retval == -1) return 1; else { - initiator_Server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + initiator_Server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.h b/TAO/tests/NestedUpcall/Triangle_Test/initiator.h index c67ca955c21..897729b0d41 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.h @@ -52,10 +52,10 @@ public: int init (int argc, char **argv - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize the Initiator_Server state - parsing arguments and ... - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the orb private: diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp b/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp index e43921d9291..1311c2ffb48 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp @@ -64,14 +64,14 @@ Object_A_Server::parse_args (void) int Object_A_Server::init (int argc, char** argv - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Call the init of TAO_ORB_Manager to create a child POA // under the root POA. this->orb_manager_.init_child_poa (argc, argv, "child_poa" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->argc_ = argc; @@ -83,7 +83,7 @@ Object_A_Server::init (int argc, CORBA::String_var str = this->orb_manager_.activate_under_child_poa ("object_A", &this->object_A_i_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, @@ -104,9 +104,9 @@ Object_A_Server::init (int argc, int -Object_A_Server::run (TAO_ENV_SINGLE_ARG_DECL) +Object_A_Server::run (ACE_ENV_SINGLE_ARG_DECL) { - int r = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER); + int r = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (r == -1) @@ -128,18 +128,18 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "\n \t NestedUpCalls.Triangle_Test: Object A Server \n \n")); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { int retval = - object_A_Server.init (argc,argv TAO_ENV_ARG_PARAMETER); + object_A_Server.init (argc,argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (retval == -1) return 1; else { - object_A_Server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + object_A_Server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.h b/TAO/tests/NestedUpcall/Triangle_Test/server_A.h index b2722bb822f..289a0e9970a 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/server_A.h @@ -49,10 +49,10 @@ public: int init (int argc, char **argv - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize the NestedUpCalls_Server state - parsing arguments and ... - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the orb private: diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp b/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp index 5a692acab73..e9a59878311 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp @@ -64,14 +64,14 @@ Object_B_Server::parse_args (void) int Object_B_Server::init (int argc, char** argv - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Call the init of TAO_ORB_Manager to create a child POA // under the root POA. this->orb_manager_.init_child_poa (argc, argv, "child_poa" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->argc_ = argc; @@ -83,7 +83,7 @@ Object_B_Server::init (int argc, CORBA::String_var str = this->orb_manager_.activate_under_child_poa ("object_B", &this->object_B_i_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, @@ -103,9 +103,9 @@ Object_B_Server::init (int argc, int -Object_B_Server::run (TAO_ENV_SINGLE_ARG_DECL) +Object_B_Server::run (ACE_ENV_SINGLE_ARG_DECL) { - if (this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER) == -1) + if (this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER) == -1) ACE_ERROR_RETURN ((LM_ERROR, "Object_B_Server::run"), -1); @@ -124,17 +124,17 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "\n \t NestedUpCalls.Triangle_Test: Object B Server \n \n")); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - int retval = object_B_Server.init (argc, argv TAO_ENV_ARG_PARAMETER); + int retval = object_B_Server.init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (retval == -1) return 1; else { - object_B_Server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + object_B_Server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_B.h b/TAO/tests/NestedUpcall/Triangle_Test/server_B.h index 783eaa652a2..5e445e3d39e 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/server_B.h @@ -49,10 +49,10 @@ public: int init (int argc, char **argv - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize the NestedUpCalls_Server state - parsing arguments and ... - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the orb private: |