diff options
Diffstat (limited to 'TAO/orbsvcs/tests/FaultTolerance/IOGR')
| -rw-r--r-- | TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp | 62 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp | 16 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h | 4 |
6 files changed, 48 insertions, 48 deletions
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h index 39790e6bf9f..00ab0bec940 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h @@ -42,7 +42,7 @@ public: Client_i (CORBA::ORB_ptr orb); // Our constructor - void init (TAO_ENV_SINGLE_ARG_DECL); + void init (ACE_ENV_SINGLE_ARG_DECL); // Initialize the ORB etc. private: diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp index 508bf74dbc1..d5069e49233 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp @@ -61,7 +61,7 @@ int main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; Manager manager; @@ -70,7 +70,7 @@ main (int argc, // Initilaize the ORB, POA etc. manager.init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // the command line arguments @@ -78,13 +78,13 @@ main (int argc, return -1; // Merge the different IORS - manager.make_merged_iors (TAO_ENV_SINGLE_ARG_PARAMETER); + manager.make_merged_iors (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; cout << "Merged IORS" <<endl; // Set properties. This is the most important portion of the // test - manager.set_properties (TAO_ENV_SINGLE_ARG_PARAMETER); + manager.set_properties (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; cout << "Set prop" <<endl; @@ -94,7 +94,7 @@ main (int argc, // Client, who is going to use the merged IOR // Construct that with the managers ORB Client_i client_imp (manager.orb ()); - client_imp.init (TAO_ENV_SINGLE_ARG_PARAMETER); + client_imp.init (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -118,58 +118,58 @@ Manager::Manager (void) void Manager::init (int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Obtain the RootPOA. CORBA::Object_var obj_var = this->orb_->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa_var = - PortableServer::POA::_narrow (obj_var.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj_var.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager_var = - root_poa_var->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa_var->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - poa_manager_var->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager_var->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } int -Manager::make_merged_iors (TAO_ENV_SINGLE_ARG_DECL) +Manager::make_merged_iors (ACE_ENV_SINGLE_ARG_DECL) { // First server object_primary = this->orb_->string_to_object (first_ior - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); //Second server object_secondary = this->orb_->string_to_object (second_ior - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Get an object reference for the ORBs IORManipultion object! CORBA_Object_ptr IORM = this->orb_->resolve_initial_references (TAO_OBJID_IORMANIPULATION, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); iorm = - TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM TAO_ENV_ARG_PARAMETER); + TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); @@ -181,14 +181,14 @@ Manager::make_merged_iors (TAO_ENV_SINGLE_ARG_DECL) // Create a merged set 1; merged_set_ = - iorm->merge_iors (iors TAO_ENV_ARG_PARAMETER); + iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; } int -Manager::set_properties (TAO_ENV_SINGLE_ARG_DECL) +Manager::set_properties (ACE_ENV_SINGLE_ARG_DECL) { FT::TagFTGroupTaggedComponent ft_tag_component; @@ -216,7 +216,7 @@ Manager::set_properties (TAO_ENV_SINGLE_ARG_DECL) // Set the property CORBA::Boolean retval = iorm->set_property (&iogr_prop, this->merged_set_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Set the primary @@ -226,7 +226,7 @@ Manager::set_properties (TAO_ENV_SINGLE_ARG_DECL) retval = iorm->set_primary (&iogr_prop, object_secondary.in (), this->merged_set_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } @@ -234,11 +234,11 @@ Manager::set_properties (TAO_ENV_SINGLE_ARG_DECL) } int -Manager::run (TAO_ENV_SINGLE_ARG_DECL) +Manager::run (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { - this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -287,10 +287,10 @@ Client_i::Client_i (CORBA::ORB_ptr orb) void run_test (Simple_Server_ptr server - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); void -Client_i::init (TAO_ENV_SINGLE_ARG_DECL) +Client_i::init (ACE_ENV_SINGLE_ARG_DECL) { // Open the file for reading. ACE_HANDLE f_handle = ACE_OS::open (ior_output_file, @@ -315,18 +315,18 @@ Client_i::init (TAO_ENV_SINGLE_ARG_DECL) this->orb_ = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Object_var object = this->orb_->string_to_object (data - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Combined IOR stuff Simple_Server_var server = Simple_Server::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (server.in ())) @@ -337,7 +337,7 @@ Client_i::init (TAO_ENV_SINGLE_ARG_DECL) } run_test (server.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ior_buffer.alloc ()->free (data); @@ -346,7 +346,7 @@ Client_i::init (TAO_ENV_SINGLE_ARG_DECL) void run_test (Simple_Server_ptr server - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // We do this twice as we know that there are only two servers. for (CORBA::ULong i = 0; @@ -360,7 +360,7 @@ void run_test (Simple_Server_ptr server j++) { // Make a remote call - server->remote_call (TAO_ENV_SINGLE_ARG_PARAMETER); + server->remote_call (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -368,7 +368,7 @@ void run_test (Simple_Server_ptr server ACE_TEXT ("*********************************\n"))); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("I am going to shutdown the server\n"))); - server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_OS::sleep (2); } diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h index a82d46c1537..6e3e2f4d6e3 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h @@ -44,17 +44,17 @@ public: void init (int argc, char *argv[] - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize the ORB, POA etc. - int make_merged_iors (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + int make_merged_iors (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); // Merges the different IORS - int set_properties (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + int set_properties (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); // Sets the properties for the profiles - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the ORB event loop.. int write_to_file (void); diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp index f078943789e..22953a7b8c5 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp @@ -35,18 +35,18 @@ main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { 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; // We do the command line parsing first if (parse_args (argc, argv) != 0) return 1; 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 ())) @@ -55,22 +55,22 @@ 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; // Instantiate the LCD_Display implementation class Simple_Server_i display_impl (orb.in ()); Simple_Server_var server = - display_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + display_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 ())); @@ -88,7 +88,7 @@ main (int argc, char *argv[]) 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 (); diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp index 31d1e20115b..9813825c275 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp @@ -20,7 +20,7 @@ Simple_Server_i::Simple_Server_i (void) } void -Simple_Server_i::remote_call (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/) +Simple_Server_i::remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -31,7 +31,7 @@ Simple_Server_i::remote_call (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ void -Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h index 0c6638822df..f7944307d55 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h @@ -34,10 +34,10 @@ public: // ctor // = The Simple_Server methods. - void remote_call (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void remote_call (ACE_ENV_SINGLE_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: |