diff options
Diffstat (limited to 'TAO/tests/Multiple')
| -rw-r--r-- | TAO/tests/Multiple/Collocation_Tester.cpp | 42 | ||||
| -rw-r--r-- | TAO/tests/Multiple/Collocation_Tester.h | 12 | ||||
| -rw-r--r-- | TAO/tests/Multiple/Multiple_Impl.cpp | 34 | ||||
| -rw-r--r-- | TAO/tests/Multiple/Multiple_Impl.h | 20 | ||||
| -rw-r--r-- | TAO/tests/Multiple/client.cpp | 8 | ||||
| -rw-r--r-- | TAO/tests/Multiple/server.cpp | 14 |
6 files changed, 65 insertions, 65 deletions
diff --git a/TAO/tests/Multiple/Collocation_Tester.cpp b/TAO/tests/Multiple/Collocation_Tester.cpp index 0723c2e42f8..1bc6df52672 100644 --- a/TAO/tests/Multiple/Collocation_Tester.cpp +++ b/TAO/tests/Multiple/Collocation_Tester.cpp @@ -39,7 +39,7 @@ Collocation_Tester::match_answer (const char *actual_answer, } int -Collocation_Tester::test_top (TAO_ENV_SINGLE_ARG_DECL) +Collocation_Tester::test_top (ACE_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\n------------------------<TOP>-------------------------------\n"))); @@ -58,7 +58,7 @@ Collocation_Tester::test_top (TAO_ENV_SINGLE_ARG_DECL) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n\nCalling all method supported by the Interface Top\n\n"))); - CORBA::String_var msg = top->top_quote (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var msg = top->top_quote (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); failure += this->match_answer (Quote::top, msg.in (), "top_quote"); @@ -74,7 +74,7 @@ Collocation_Tester::test_top (TAO_ENV_SINGLE_ARG_DECL) } int -Collocation_Tester::test_right (TAO_ENV_SINGLE_ARG_DECL) +Collocation_Tester::test_right (ACE_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\n------------------------<RIGHT>-------------------------------\n"))); @@ -93,12 +93,12 @@ Collocation_Tester::test_right (TAO_ENV_SINGLE_ARG_DECL) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n\nCalling all method supported by the Interface Right\n\n"))); - CORBA::String_var msg = right->top_quote (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var msg = right->top_quote (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (1); failure += this->match_answer (Quote::top, msg.in (), "top_quote"); - msg = right->right_quote (TAO_ENV_SINGLE_ARG_PARAMETER); + msg = right->right_quote (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (1); failure += this->match_answer (Quote::right, msg.in (), "right_quote"); @@ -115,7 +115,7 @@ Collocation_Tester::test_right (TAO_ENV_SINGLE_ARG_DECL) int -Collocation_Tester::test_left (TAO_ENV_SINGLE_ARG_DECL) +Collocation_Tester::test_left (ACE_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\n------------------------<LEFT>-------------------------------\n"))); @@ -135,12 +135,12 @@ Collocation_Tester::test_left (TAO_ENV_SINGLE_ARG_DECL) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n\nCalling all method supported by the Interface Left\n\n"))); - CORBA::String_var msg = left->top_quote (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var msg = left->top_quote (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (1); failure += this->match_answer (Quote::top, msg.in (), "top_quote"); - msg = left->left_quote (TAO_ENV_SINGLE_ARG_PARAMETER); + msg = left->left_quote (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN(1); failure += this->match_answer (Quote::left, msg.in (), "left_quote"); @@ -157,7 +157,7 @@ Collocation_Tester::test_left (TAO_ENV_SINGLE_ARG_DECL) int -Collocation_Tester::test_bottom (TAO_ENV_SINGLE_ARG_DECL) +Collocation_Tester::test_bottom (ACE_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\n-----------------------<BOTTOM>-------------------------------\n"))); @@ -177,22 +177,22 @@ Collocation_Tester::test_bottom (TAO_ENV_SINGLE_ARG_DECL) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n\nCalling all method supported by the Interface Bottom\n\n"))); - CORBA::String_var msg = bottom->top_quote (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var msg = bottom->top_quote (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN(1); failure += this->match_answer (Quote::top, msg.in (), "top_quote"); - msg = bottom->left_quote (TAO_ENV_SINGLE_ARG_PARAMETER); + msg = bottom->left_quote (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (1); failure += this->match_answer (Quote::left, msg.in (), "left_quote"); - msg = bottom->right_quote (TAO_ENV_SINGLE_ARG_PARAMETER); + msg = bottom->right_quote (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN(1); failure += this->match_answer (Quote::right, msg.in (), "right_quote"); - msg = bottom->bottom_quote (TAO_ENV_SINGLE_ARG_PARAMETER); + msg = bottom->bottom_quote (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN(1); failure += this->match_answer (Quote::bottom, msg.in (), "bottom_quote"); @@ -208,7 +208,7 @@ Collocation_Tester::test_bottom (TAO_ENV_SINGLE_ARG_DECL) } void -Collocation_Tester::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Collocation_Tester::shutdown (ACE_ENV_SINGLE_ARG_DECL) { Multiple::Top_var top = Multiple::Top::_narrow (this->object_.in ()); @@ -223,23 +223,23 @@ Collocation_Tester::shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n\nCalling ShutDown on Top.\n\n"))); - top->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + top->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Collocation_Tester::run (TAO_ENV_SINGLE_ARG_DECL) +Collocation_Tester::run (ACE_ENV_SINGLE_ARG_DECL) { - int failure_num = this->test_top (TAO_ENV_SINGLE_ARG_PARAMETER); + int failure_num = this->test_top (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - failure_num += this->test_left (TAO_ENV_SINGLE_ARG_PARAMETER); + failure_num += this->test_left (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - failure_num += this->test_right (TAO_ENV_SINGLE_ARG_PARAMETER); + failure_num += this->test_right (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - failure_num += this->test_bottom (TAO_ENV_SINGLE_ARG_PARAMETER); + failure_num += this->test_bottom (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (failure_num) @@ -249,5 +249,5 @@ Collocation_Tester::run (TAO_ENV_SINGLE_ARG_DECL) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n\nThe Test Completed Successfully. Congratulations! "))); - this->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); } diff --git a/TAO/tests/Multiple/Collocation_Tester.h b/TAO/tests/Multiple/Collocation_Tester.h index 766242232bc..5a22ad55ace 100644 --- a/TAO/tests/Multiple/Collocation_Tester.h +++ b/TAO/tests/Multiple/Collocation_Tester.h @@ -39,7 +39,7 @@ public: ~Collocation_Tester (); // -- Command -- - void run (TAO_ENV_SINGLE_ARG_DECL); + void run (ACE_ENV_SINGLE_ARG_DECL); // Runs the test. @@ -47,19 +47,19 @@ private: // -- Helper Methods -- - int test_top (TAO_ENV_SINGLE_ARG_DECL); + int test_top (ACE_ENV_SINGLE_ARG_DECL); // Tests the method accessible thru the // Top interface. - int test_right (TAO_ENV_SINGLE_ARG_DECL); + int test_right (ACE_ENV_SINGLE_ARG_DECL); // Tests the method accessible thru the // Right interface. - int test_left (TAO_ENV_SINGLE_ARG_DECL); + int test_left (ACE_ENV_SINGLE_ARG_DECL); // Tests the method accessible thru the // Left interface. - int test_bottom (TAO_ENV_SINGLE_ARG_DECL); + int test_bottom (ACE_ENV_SINGLE_ARG_DECL); // Tests the method accessible thru the // Bottom interface. @@ -72,7 +72,7 @@ private: // is no match (actually 1 is returned if there is // no match. - void shutdown (TAO_ENV_SINGLE_ARG_DECL); + void shutdown (ACE_ENV_SINGLE_ARG_DECL); private: CORBA::Object_var object_; }; diff --git a/TAO/tests/Multiple/Multiple_Impl.cpp b/TAO/tests/Multiple/Multiple_Impl.cpp index d65dfde3c07..54e95ead3e1 100644 --- a/TAO/tests/Multiple/Multiple_Impl.cpp +++ b/TAO/tests/Multiple/Multiple_Impl.cpp @@ -20,38 +20,38 @@ Bottom_Impl::~Bottom_Impl (void) } char * -Bottom_Impl::top_quote (TAO_ENV_SINGLE_ARG_DECL_NOT_USED ) +Bottom_Impl::top_quote (ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup(Quote::top); } char * -Bottom_Impl::left_quote (TAO_ENV_SINGLE_ARG_DECL_NOT_USED ) +Bottom_Impl::left_quote (ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup(Quote::left); } char * -Bottom_Impl::right_quote (TAO_ENV_SINGLE_ARG_DECL_NOT_USED ) +Bottom_Impl::right_quote (ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup(Quote::right); } char * -Bottom_Impl::bottom_quote (TAO_ENV_SINGLE_ARG_DECL_NOT_USED ) +Bottom_Impl::bottom_quote (ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup(Quote::bottom); } void -Bottom_Impl::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Bottom_Impl::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); } /////////////////////////////////////////////////////////// @@ -70,64 +70,64 @@ Delegated_Bottom_Impl::~Delegated_Bottom_Impl (void) } char * -Delegated_Bottom_Impl::top_quote (TAO_ENV_SINGLE_ARG_DECL) +Delegated_Bottom_Impl::top_quote (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Delegating the call: <top_quote>\n"))); CORBA::String_var msg = - this->delegate_->top_quote (TAO_ENV_SINGLE_ARG_PARAMETER); + this->delegate_->top_quote (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return msg._retn (); } char * -Delegated_Bottom_Impl::left_quote (TAO_ENV_SINGLE_ARG_DECL) +Delegated_Bottom_Impl::left_quote (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Delegating the call: <left_quote>\n"))); CORBA::String_var msg = - this->delegate_->left_quote (TAO_ENV_SINGLE_ARG_PARAMETER); + this->delegate_->left_quote (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return msg._retn (); } char * -Delegated_Bottom_Impl::right_quote (TAO_ENV_SINGLE_ARG_DECL) +Delegated_Bottom_Impl::right_quote (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Delegating the call: <right_quote>\n"))); CORBA::String_var msg = - this->delegate_->right_quote (TAO_ENV_SINGLE_ARG_PARAMETER); + this->delegate_->right_quote (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return msg._retn (); } char * -Delegated_Bottom_Impl::bottom_quote (TAO_ENV_SINGLE_ARG_DECL) +Delegated_Bottom_Impl::bottom_quote (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Delegating the call: <bottom_quote>\n"))); CORBA::String_var msg = - this->delegate_->bottom_quote (TAO_ENV_SINGLE_ARG_PARAMETER); + this->delegate_->bottom_quote (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return msg._retn (); } void -Delegated_Bottom_Impl::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Delegated_Bottom_Impl::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Delegating Shut-Down.\n"))); - this->delegate_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); - //this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->delegate_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); + //this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/tests/Multiple/Multiple_Impl.h b/TAO/tests/Multiple/Multiple_Impl.h index e0a563896bc..e97f97ca80e 100644 --- a/TAO/tests/Multiple/Multiple_Impl.h +++ b/TAO/tests/Multiple/Multiple_Impl.h @@ -40,27 +40,27 @@ public: virtual ~Bottom_Impl (void); // IDL Interface Methods - virtual char * top_quote (TAO_ENV_SINGLE_ARG_DECL) + virtual char * top_quote (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual char * left_quote (TAO_ENV_SINGLE_ARG_DECL) + virtual char * left_quote (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual char * right_quote (TAO_ENV_SINGLE_ARG_DECL) + virtual char * right_quote (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual char * bottom_quote (TAO_ENV_SINGLE_ARG_DECL) + virtual char * bottom_quote (ACE_ENV_SINGLE_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 )); @@ -89,24 +89,24 @@ public: virtual ~Delegated_Bottom_Impl (void); // IDL Interface Methods. - virtual char * top_quote (TAO_ENV_SINGLE_ARG_DECL) + virtual char * top_quote (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual char * left_quote (TAO_ENV_SINGLE_ARG_DECL) + virtual char * left_quote (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual char * right_quote (TAO_ENV_SINGLE_ARG_DECL) + virtual char * right_quote (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); - virtual char * bottom_quote (TAO_ENV_SINGLE_ARG_DECL) + virtual char * bottom_quote (ACE_ENV_SINGLE_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 )); diff --git a/TAO/tests/Multiple/client.cpp b/TAO/tests/Multiple/client.cpp index 796976b3470..8a2d499abce 100644 --- a/TAO/tests/Multiple/client.cpp +++ b/TAO/tests/Multiple/client.cpp @@ -6,18 +6,18 @@ ACE_RCSID (tests, client, "$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; // Get The IOR from a file - object = orb->string_to_object ("file://s.ior" TAO_ENV_ARG_PARAMETER); + object = orb->string_to_object ("file://s.ior" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (object.in ())) @@ -27,7 +27,7 @@ int main (int argc, char *argv[]) } Collocation_Tester tester (object.in ()); - tester.run (TAO_ENV_SINGLE_ARG_PARAMETER); + tester.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY 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(); |