diff options
Diffstat (limited to 'TAO/examples')
222 files changed, 1847 insertions, 1847 deletions
diff --git a/TAO/examples/AMI/FL_Callback/Peer_i.cpp b/TAO/examples/AMI/FL_Callback/Peer_i.cpp index fb81056443c..59f3cbfaae1 100644 --- a/TAO/examples/AMI/FL_Callback/Peer_i.cpp +++ b/TAO/examples/AMI/FL_Callback/Peer_i.cpp @@ -15,36 +15,36 @@ Peer_Handler_i::Peer_Handler_i (Peer_i *peer) void Peer_Handler_i::request (CORBA::Long retval - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { static int i = 0; i++; if (i % 100 == 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) %d replies received\n", i)); - this->peer_->reply (retval TAO_ENV_ARG_PARAMETER); + this->peer_->reply (retval ACE_ENV_ARG_PARAMETER); } void Peer_Handler_i::request_excep ( AMI_PeerExceptionHolder * excep_holder - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_UNUSED_ARG (excep_holder); - TAO_ENV_ARG_NOT_USED; + ACE_ENV_ARG_NOT_USED; } void -Peer_Handler_i::start (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Peer_Handler_i::start (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } void -Peer_Handler_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Peer_Handler_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -63,32 +63,32 @@ void Peer_i::init (CORBA::ORB_ptr orb, Progress_ptr progress, const ACE_Time_Value &delay - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_ = CORBA::ORB::_duplicate (orb); this->progress_ = Progress::_duplicate (progress); this->delay_ = delay; - Peer_var peer = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + Peer_var peer = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "Peer (%P|%t) - binding\n")); - this->id_ = this->progress_->bind (peer.in () TAO_ENV_ARG_PARAMETER); + this->id_ = this->progress_->bind (peer.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void Peer_i::reply (CORBA::Long result - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->progress_->recv_reply (result TAO_ENV_ARG_PARAMETER); + this->progress_->recv_reply (result ACE_ENV_ARG_PARAMETER); } CORBA::Long Peer_i::request (CORBA::Long id - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Time_Value tv = this->delay_; @@ -100,11 +100,11 @@ Peer_i::request (CORBA::Long id void Peer_i::start (const PeerSet &the_peers, CORBA::Long iterations - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { AMI_PeerHandler_var handler = - this->reply_handler_._this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->reply_handler_._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // @@ Report errors as exceptions... @@ -118,10 +118,10 @@ Peer_i::start (const PeerSet &the_peers, } void -Peer_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Peer_i::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); } // **************************************************************** @@ -151,11 +151,11 @@ Peer_Task::svc (void) { this->the_peers_[j]->sendc_request (this->handler_.in (), this->id_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->progress_->sent_request (this->id_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/AMI/FL_Callback/Peer_i.h b/TAO/examples/AMI/FL_Callback/Peer_i.h index 8f95390f898..c0583be398c 100644 --- a/TAO/examples/AMI/FL_Callback/Peer_i.h +++ b/TAO/examples/AMI/FL_Callback/Peer_i.h @@ -28,17 +28,17 @@ public: // The peer virtual void request (CORBA::Long retval - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void request_excep (AMI_PeerExceptionHolder * excep_holder - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void start (TAO_ENV_SINGLE_ARG_DECL) + virtual void start (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)); private: @@ -58,26 +58,26 @@ public: void init (CORBA::ORB_ptr orb, Progress_ptr progress, const ACE_Time_Value &delay - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); void reply (CORBA::Long result - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Used by the Reply_Handler to indicate that a reply has been // received. // = See test.idl for an explanation of these methods. CORBA::Long request (CORBA::Long id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); void start (const PeerSet& the_peers, CORBA::Long iterations - 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/examples/AMI/FL_Callback/Progress_i.cpp b/TAO/examples/AMI/FL_Callback/Progress_i.cpp index bbadc2933d4..678847e328c 100644 --- a/TAO/examples/AMI/FL_Callback/Progress_i.cpp +++ b/TAO/examples/AMI/FL_Callback/Progress_i.cpp @@ -20,7 +20,7 @@ Progress_i::Progress_i (Progress_Window *window) void Progress_i::sent_request (CORBA::Long id - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { //ACE_DEBUG ((LM_DEBUG, "Progress (%t) - sent request %d\n", id)); @@ -29,7 +29,7 @@ Progress_i::sent_request (CORBA::Long id void Progress_i::recv_reply (CORBA::Long id - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->window_->recv_reply (id); @@ -37,11 +37,11 @@ Progress_i::recv_reply (CORBA::Long id CORBA::Long Progress_i::bind (Peer_ptr a_peer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Progress (%t) - peer bound\n")); - return this->window_->bind (a_peer TAO_ENV_ARG_PARAMETER); + return this->window_->bind (a_peer ACE_ENV_ARG_PARAMETER); } // **************************************************************** @@ -132,7 +132,7 @@ Progress_Window::recv_reply (CORBA::Long id) CORBA::Long Progress_Window::bind (Peer_ptr a_peer - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { CORBA::ULong l = this->peers_.length (); this->peers_.length (l + 1); @@ -155,14 +155,14 @@ Progress_Window::start () if (this->peers_.length () < CORBA::ULong (this->n_peers_)) return; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; for (CORBA::ULong i = 0; i != this->peers_.length (); ++i) { ACE_TRY { this->peers_[i]->start (this->peers_, this->n_iterations_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/AMI/FL_Callback/Progress_i.h b/TAO/examples/AMI/FL_Callback/Progress_i.h index 8ffc57f0aac..e382d928147 100644 --- a/TAO/examples/AMI/FL_Callback/Progress_i.h +++ b/TAO/examples/AMI/FL_Callback/Progress_i.h @@ -37,7 +37,7 @@ public: // Keep track of the progress on each peer CORBA::Long bind (Peer_ptr a_peer - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // One of the peers has bound to the server void start (void); @@ -77,13 +77,13 @@ public: // = The Progress methods. void sent_request (CORBA::Long id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); void recv_reply (CORBA::Long id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Long bind (Peer_ptr a_peer - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/examples/AMI/FL_Callback/peer.cpp b/TAO/examples/AMI/FL_Callback/peer.cpp index 4107d860a18..1bb06563a62 100644 --- a/TAO/examples/AMI/FL_Callback/peer.cpp +++ b/TAO/examples/AMI/FL_Callback/peer.cpp @@ -100,11 +100,11 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { 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; 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 ())) @@ -113,25 +113,25 @@ 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; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var progress_object = - orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Progress_var progress = - Progress::_narrow (progress_object.in () TAO_ENV_ARG_PARAMETER); + Progress::_narrow (progress_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Time_Value delay (0, interval); @@ -140,7 +140,7 @@ main (int argc, char *argv[]) peer.init (orb.in (), progress.in (), delay - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Worker worker (orb.in ()); diff --git a/TAO/examples/AMI/FL_Callback/progress.cpp b/TAO/examples/AMI/FL_Callback/progress.cpp index 715382edd46..8246bf37552 100644 --- a/TAO/examples/AMI/FL_Callback/progress.cpp +++ b/TAO/examples/AMI/FL_Callback/progress.cpp @@ -62,11 +62,11 @@ parse_args (int argc, char *argv[]) int 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; if (parse_args (argc, argv) != 0) @@ -91,7 +91,7 @@ main (int argc, char *argv[]) sw.show (); 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 ())) @@ -100,24 +100,24 @@ 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; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Progress_i server_impl (&sw); Progress_var server = - server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + server_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 ())); diff --git a/TAO/examples/Advanced/ch_12/server.cpp b/TAO/examples/Advanced/ch_12/server.cpp index da02c606a7b..d38195dcebb 100644 --- a/TAO/examples/Advanced/ch_12/server.cpp +++ b/TAO/examples/Advanced/ch_12/server.cpp @@ -564,7 +564,7 @@ preinvoke (const PortableServer::ObjectId & oid, PortableServer::POA_ptr /*poa*/, const char * operation, void * & /*cookie*/ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) throw (CORBA::SystemException, PortableServer::ForwardRequest) { // Convert object id into asset number. diff --git a/TAO/examples/Advanced/ch_12/server.h b/TAO/examples/Advanced/ch_12/server.h index 89b18973856..5aff30fa960 100644 --- a/TAO/examples/Advanced/ch_12/server.h +++ b/TAO/examples/Advanced/ch_12/server.h @@ -190,7 +190,7 @@ public: PortableServer::POA_ptr poa, const char * operation, void * & cookie - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) throw (CORBA::SystemException, PortableServer::ForwardRequest); virtual void @@ -199,7 +199,7 @@ public: const char * /*operation*/, void * /*cookie*/, PortableServer::Servant /*servant*/ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) throw (CORBA::SystemException) {} private: Controller_impl * m_ctrl; diff --git a/TAO/examples/Buffered_AMI/client.cpp b/TAO/examples/Buffered_AMI/client.cpp index bce2bb155d6..84efc422e73 100644 --- a/TAO/examples/Buffered_AMI/client.cpp +++ b/TAO/examples/Buffered_AMI/client.cpp @@ -49,7 +49,7 @@ class Reply_Handler : public POA_AMI_testHandler { public: void method (CORBA::ULong reply_number - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -62,12 +62,12 @@ public: } void method_excep (AMI_testExceptionHolder *holder - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY { - holder->raise_method (TAO_ENV_SINGLE_ARG_PARAMETER); + holder->raise_method (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH(CORBA::SystemException, ex) @@ -77,18 +77,18 @@ public: ACE_ENDTRY; } - void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } void shutdown_excep (AMI_testExceptionHolder *holder - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY { - holder->raise_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + holder->raise_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH(CORBA::SystemException, ex) @@ -178,17 +178,17 @@ parse_args (int argc, char **argv) void setup_buffering_constraints (CORBA::ORB_ptr orb - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Obtain PolicyCurrent. CORBA::Object_var object = orb->resolve_initial_references ("PolicyCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Narrow down to correct type. CORBA::PolicyCurrent_var policy_current = CORBA::PolicyCurrent::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Start off with no constraints. @@ -210,17 +210,17 @@ setup_buffering_constraints (CORBA::ORB_ptr orb buffering_constraint_policy_list[0] = orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE, buffering_constraint_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Setup the constraints (at the ORB level). policy_current->set_policy_overrides (buffering_constraint_policy_list, CORBA::ADD_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // We are done with the policy. - buffering_constraint_policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + buffering_constraint_policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Setup the none sync scope policy, i.e., the ORB will buffer AMI @@ -239,24 +239,24 @@ setup_buffering_constraints (CORBA::ORB_ptr orb sync_none_policy_list[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, sync_none_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Setup the none sync scope (at the ORB level). policy_current->set_policy_overrides (sync_none_policy_list, CORBA::ADD_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // We are now done with these policies. - sync_none_policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + sync_none_policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -265,7 +265,7 @@ main (int argc, char **argv) CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize options based on command-line arguments. @@ -275,39 +275,39 @@ main (int argc, char **argv) CORBA::Object_var base = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (base.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get an object reference from the argument string. base = orb->string_to_object (IOR - 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; // Try to narrow the object reference to a <test> reference. test_var test_object = test::_narrow (base.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Reply_Handler reply_handler_servant; - AMI_testHandler_var reply_handler_object = reply_handler_servant._this (TAO_ENV_SINGLE_ARG_PARAMETER); + AMI_testHandler_var reply_handler_object = reply_handler_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (setup_buffering) { setup_buffering_constraints (orb.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -322,7 +322,7 @@ main (int argc, char **argv) // Invoke the AMI method. test_object->sendc_method (reply_handler_object.in (), i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else @@ -332,7 +332,7 @@ main (int argc, char **argv) // Invoke the regular method. test_object->method (i, reply_number - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -344,7 +344,7 @@ main (int argc, char **argv) ACE_Time_Value sleep_interval (0, interval * 1000); - orb->run (sleep_interval TAO_ENV_ARG_PARAMETER); + orb->run (sleep_interval ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -357,13 +357,13 @@ main (int argc, char **argv) // Shutdown server. if (shutdown_server) { - test_object->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + test_object->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; // Destroy the ORB. On some platforms, e.g., Win32, the socket @@ -372,7 +372,7 @@ main (int argc, char **argv) // static destructors to flush the queues, it will be too late. // Therefore, we use explicit destruction here and flush the // queues before main() ends. - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Buffered_AMI/server.cpp b/TAO/examples/Buffered_AMI/server.cpp index e23c785c2e4..61e8cd0bc78 100644 --- a/TAO/examples/Buffered_AMI/server.cpp +++ b/TAO/examples/Buffered_AMI/server.cpp @@ -42,21 +42,21 @@ main (int argc, char *argv[]) CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_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 (poa_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; if (parse_args (argc, argv) != 0) @@ -65,12 +65,12 @@ main (int argc, char *argv[]) test_i servant (orb.in ()); test_var server = - servant._this (TAO_ENV_SINGLE_ARG_PARAMETER); + servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = orb->object_to_string (server.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -84,17 +84,17 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Buffered_AMI/test_i.cpp b/TAO/examples/Buffered_AMI/test_i.cpp index 2cf8850817b..0b3d8ffd45e 100644 --- a/TAO/examples/Buffered_AMI/test_i.cpp +++ b/TAO/examples/Buffered_AMI/test_i.cpp @@ -12,7 +12,7 @@ test_i::test_i (CORBA::ORB_ptr orb) void test_i::method (CORBA::ULong request_number, CORBA::ULong_out reply_number - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -23,9 +23,9 @@ test_i::method (CORBA::ULong request_number, } void -test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/examples/Buffered_AMI/test_i.h b/TAO/examples/Buffered_AMI/test_i.h index c83114c88d0..e42bb2e1bcd 100644 --- a/TAO/examples/Buffered_AMI/test_i.h +++ b/TAO/examples/Buffered_AMI/test_i.h @@ -30,10 +30,10 @@ public: // = The test interface methods. void method (CORBA::ULong request_number, CORBA::ULong_out reply_number - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_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: diff --git a/TAO/examples/Buffered_Oneways/client.cpp b/TAO/examples/Buffered_Oneways/client.cpp index afd3337e212..5668e5f9c05 100644 --- a/TAO/examples/Buffered_Oneways/client.cpp +++ b/TAO/examples/Buffered_Oneways/client.cpp @@ -115,7 +115,7 @@ parse_args (int argc, char **argv) int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -124,7 +124,7 @@ main (int argc, char **argv) CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize options based on command-line arguments. @@ -135,23 +135,23 @@ main (int argc, char **argv) // Get an object reference from the argument string. CORBA::Object_var base = orb->string_to_object (IOR - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Try to narrow the object reference to a <test> reference. test_var test_object = test::_narrow (base.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain PolicyCurrent. base = orb->resolve_initial_references ("PolicyCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow down to correct type. CORBA::PolicyCurrent_var policy_current = CORBA::PolicyCurrent::_narrow (base.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Setup the none sync scope policy, i.e., the ORB will buffer @@ -170,17 +170,17 @@ main (int argc, char **argv) sync_none_policy_list[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, sync_none_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Setup the none sync scope. policy_current->set_policy_overrides (sync_none_policy_list, CORBA::ADD_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // We are now done with this policy. - sync_none_policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + sync_none_policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Start off with no constraints. @@ -226,13 +226,13 @@ main (int argc, char **argv) buffering_constraint_policy_list[0] = orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE, buffering_constraint_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Setup the constraints. policy_current->set_policy_overrides (buffering_constraint_policy_list, CORBA::ADD_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // @@ -259,7 +259,7 @@ main (int argc, char **argv) buffering_flush_policy_list[0] = orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE, buffering_flush_any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // @@ -275,7 +275,7 @@ main (int argc, char **argv) // Setup explicit flushing. policy_current->set_policy_overrides (buffering_flush_policy_list, CORBA::ADD_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -284,13 +284,13 @@ main (int argc, char **argv) // Invoke the oneway method. test_object->method (i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Reset buffering policy. policy_current->set_policy_overrides (buffering_constraint_policy_list, CORBA::ADD_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else @@ -301,7 +301,7 @@ main (int argc, char **argv) // Invoke the oneway method. test_object->method (i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -309,23 +309,23 @@ main (int argc, char **argv) ACE_Time_Value sleep_interval (0, interval * 1000); - orb->run (sleep_interval TAO_ENV_ARG_PARAMETER); + orb->run (sleep_interval ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } // Shutdown server. if (shutdown_server) { - test_object->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + test_object->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } // We are done with the policy. - buffering_constraint_policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + buffering_constraint_policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // We are done with the policy. - buffering_flush_policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + buffering_flush_policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Destroy the ORB. On some platforms, e.g., Win32, the socket @@ -334,7 +334,7 @@ main (int argc, char **argv) // static destructors to flush the queues, it will be too late. // Therefore, we use explicit destruction here and flush the // queues before main() ends. - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Buffered_Oneways/server.cpp b/TAO/examples/Buffered_Oneways/server.cpp index 76e98cac2e8..31d6a5a42af 100644 --- a/TAO/examples/Buffered_Oneways/server.cpp +++ b/TAO/examples/Buffered_Oneways/server.cpp @@ -42,21 +42,21 @@ main (int argc, char *argv[]) CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_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 (poa_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; if (parse_args (argc, argv) != 0) @@ -65,12 +65,12 @@ main (int argc, char *argv[]) test_i servant (orb.in ()); test_var server = - servant._this (TAO_ENV_SINGLE_ARG_PARAMETER); + servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = orb->object_to_string (server.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -84,17 +84,17 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Buffered_Oneways/test_i.cpp b/TAO/examples/Buffered_Oneways/test_i.cpp index 74b1323a4df..95972fe8939 100644 --- a/TAO/examples/Buffered_Oneways/test_i.cpp +++ b/TAO/examples/Buffered_Oneways/test_i.cpp @@ -11,7 +11,7 @@ test_i::test_i (CORBA::ORB_ptr orb) void test_i::method (CORBA::ULong request_number - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -20,9 +20,9 @@ test_i::method (CORBA::ULong request_number } void -test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/examples/Buffered_Oneways/test_i.h b/TAO/examples/Buffered_Oneways/test_i.h index cbe1b31e777..c8a79e05bb3 100644 --- a/TAO/examples/Buffered_Oneways/test_i.h +++ b/TAO/examples/Buffered_Oneways/test_i.h @@ -29,10 +29,10 @@ public: // = The test interface methods. void method (CORBA::ULong request_number - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_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: diff --git a/TAO/examples/Callback_Quoter/Consumer_Handler.cpp b/TAO/examples/Callback_Quoter/Consumer_Handler.cpp index 647b643db66..4aeab0b4941 100644 --- a/TAO/examples/Callback_Quoter/Consumer_Handler.cpp +++ b/TAO/examples/Callback_Quoter/Consumer_Handler.cpp @@ -161,7 +161,7 @@ Consumer_Handler::parse_args (void) int Consumer_Handler::via_naming_service (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialization of the naming service. @@ -177,14 +177,14 @@ Consumer_Handler::via_naming_service (void) CORBA::Object_var notifier_obj = this->naming_services_client_->resolve (notifier_ref_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // The CORBA::Object_var object is downcast to Notifier_var using // the <_narrow> method. this->server_ = Notifier::_narrow (notifier_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -211,14 +211,14 @@ Consumer_Handler::init (int argc, char **argv) // Register our <Input_Handler> to handle STDIN events, which will // trigger the <handle_input> method to process these events. - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Retrieve the ORB. this->orb_ = CORBA::ORB_init (this->argc_, this->argv_, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -281,7 +281,7 @@ Consumer_Handler::init (int argc, char **argv) CORBA::Object_var server_object = this->orb_->string_to_object (this->ior_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server_object.in ())) @@ -292,7 +292,7 @@ Consumer_Handler::init (int argc, char **argv) // The downcasting from CORBA::Object_var to Notifier_var is // done using the <_narrow> method. this->server_ = Notifier::_narrow (server_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -312,23 +312,23 @@ int Consumer_Handler::run (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Obtain and activate the RootPOA. CORBA::Object_var obj = - this->orb_->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.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_NEW_RETURN (this->consumer_servant_, @@ -339,7 +339,7 @@ Consumer_Handler::run (void) // Get the consumer stub (i.e consumer object) pointer. this->consumer_var_ = - this->consumer_servant_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumer_servant_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (this->interactive_ == 0) @@ -349,7 +349,7 @@ Consumer_Handler::run (void) this->server_->register_callback (this->stock_name_, this->threshold_value_, this->consumer_var_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Note the registration. @@ -361,7 +361,7 @@ Consumer_Handler::run (void) } // Run the ORB. - this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/examples/Callback_Quoter/Consumer_Input_Handler.cpp b/TAO/examples/Callback_Quoter/Consumer_Input_Handler.cpp index c98a8522314..a06a4267cf3 100644 --- a/TAO/examples/Callback_Quoter/Consumer_Input_Handler.cpp +++ b/TAO/examples/Callback_Quoter/Consumer_Input_Handler.cpp @@ -102,7 +102,7 @@ Consumer_Input_Handler::register_consumer () this->consumer_handler_->threshold_value_ = ACE_OS::atoi (needed_stock_value); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -111,7 +111,7 @@ Consumer_Input_Handler::register_consumer () this->consumer_handler_->server_->register_callback (this->consumer_handler_->stock_name_, this->consumer_handler_->threshold_value_, this->consumer_handler_->consumer_var_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Note the registration. @@ -165,7 +165,7 @@ Consumer_Input_Handler::quit_consumer_process () // Only if the consumer is registered and wants to shut // down, its necessary to unregister and then shutdown. - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -173,9 +173,9 @@ Consumer_Input_Handler::quit_consumer_process () { // If the notifier has exited and the consumer tries to call // the unregister_callback method tehn an execption will be - // raised. Hence check for this case using TAO_ENV_SINGLE_ARG_PARAMETER. + // raised. Hence check for this case using ACE_ENV_SINGLE_ARG_PARAMETER. this->consumer_handler_->server_->unregister_callback (this->consumer_handler_->consumer_var_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -183,7 +183,7 @@ Consumer_Input_Handler::quit_consumer_process () consumer_handler_->unregistered_ = 0; consumer_handler_->registered_ = 0; } - this->consumer_handler_->consumer_servant_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumer_handler_->consumer_servant_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -196,7 +196,7 @@ Consumer_Input_Handler::quit_consumer_process () ACE_TRY_EX (block1) { - this->consumer_handler_->consumer_servant_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumer_handler_->consumer_servant_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK_EX (block1); } ACE_CATCHANY diff --git a/TAO/examples/Callback_Quoter/Consumer_Signal_Handler.cpp b/TAO/examples/Callback_Quoter/Consumer_Signal_Handler.cpp index d78291ee729..5fe25a265f6 100644 --- a/TAO/examples/Callback_Quoter/Consumer_Signal_Handler.cpp +++ b/TAO/examples/Callback_Quoter/Consumer_Signal_Handler.cpp @@ -39,7 +39,7 @@ Consumer_Signal_Handler::handle_signal (int /* signum */, " Exiting on receiving ^C\n")); quit_on_signal (); - + return 0; } @@ -66,13 +66,13 @@ Consumer_Signal_Handler::quit_on_signal (void) { if (consumer_handler_->unregistered_ != 1 && consumer_handler_->registered_ == 1) - { - this->consumer_handler_->server_->unregister_callback + { + this->consumer_handler_->server_->unregister_callback (this->consumer_handler_->consumer_var_.in ()); - ACE_DEBUG ((LM_DEBUG, - "Consumer Unregistered\n")); + ACE_DEBUG ((LM_DEBUG, + "Consumer Unregistered\n")); } - this->consumer_handler_->consumer_servant_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumer_handler_->consumer_servant_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Callback_Quoter/Consumer_i.cpp b/TAO/examples/Callback_Quoter/Consumer_i.cpp index 380ff65ecfe..b892a31372c 100644 --- a/TAO/examples/Callback_Quoter/Consumer_i.cpp +++ b/TAO/examples/Callback_Quoter/Consumer_i.cpp @@ -29,7 +29,7 @@ Consumer_i::~Consumer_i (void) void Consumer_i::push (const Callback_Quoter::Info &data - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // On getting the needed information you now proceed to the next @@ -42,7 +42,7 @@ Consumer_i::push (const Callback_Quoter::Info &data } void -Consumer_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Consumer_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/examples/Callback_Quoter/Consumer_i.h b/TAO/examples/Callback_Quoter/Consumer_i.h index 3e7a28df332..839f2768c6a 100644 --- a/TAO/examples/Callback_Quoter/Consumer_i.h +++ b/TAO/examples/Callback_Quoter/Consumer_i.h @@ -40,11 +40,11 @@ public: // Destructor. void push (const Callback_Quoter::Info & data - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Gets the stock information from the Notifier. - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Used to get the consumer to shut down. diff --git a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp index b117ea3d1ab..edaff2abfee 100644 --- a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp +++ b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp @@ -52,7 +52,7 @@ Notifier_Input_Handler::~Notifier_Input_Handler (void) // the object name is bound to the naming server. int -Notifier_Input_Handler::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) +Notifier_Input_Handler::init_naming_service (ACE_ENV_SINGLE_ARG_DECL) { CORBA::ORB_var orb = this->orb_manager_.orb (); @@ -69,15 +69,15 @@ Notifier_Input_Handler::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) // (re)Bind the object. ACE_TRY { - Notifier_var notifier_obj = notifier_i_._this (TAO_ENV_SINGLE_ARG_PARAMETER); + Notifier_var notifier_obj = notifier_i_._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - 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; naming_server_->rebind (notifier_obj_name, notifier_obj.in() - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -142,7 +142,7 @@ Notifier_Input_Handler::parse_args (void) int Notifier_Input_Handler::init (int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Call the init of <TAO_ORB_Manager> to initialize the ORB and @@ -154,7 +154,7 @@ Notifier_Input_Handler::init (int argc, if (this->orb_manager_.init_child_poa (this->argc_, this->argv_, "child_poa" - TAO_ENV_ARG_PARAMETER) == -1) + ACE_ENV_ARG_PARAMETER) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "init_child_poa"), @@ -187,7 +187,7 @@ Notifier_Input_Handler::init (int argc, CORBA::String_var str = this->orb_manager_.activate_under_child_poa ("Notifier", &this->notifier_i_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, @@ -204,14 +204,14 @@ Notifier_Input_Handler::init (int argc, if (this->using_naming_service_) { - this->init_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER); + this->init_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } return 0; } int -Notifier_Input_Handler::run (TAO_ENV_SINGLE_ARG_DECL) +Notifier_Input_Handler::run (ACE_ENV_SINGLE_ARG_DECL) { // Run the main event loop for the ORB. @@ -219,7 +219,7 @@ Notifier_Input_Handler::run (TAO_ENV_SINGLE_ARG_DECL) ACE_DEBUG ((LM_DEBUG, " Type \"q\" to quit \n ")); - int result = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER); + int result = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (result == -1) @@ -237,7 +237,7 @@ Notifier_Input_Handler::handle_input (ACE_HANDLE) { char buf[BUFSIZ]; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -259,7 +259,7 @@ Notifier_Input_Handler::handle_input (ACE_HANDLE) { // @@ Please remove this call if it's not used. // (this->notifier_i_.consumer_map_).close(); - this->notifier_i_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->notifier_i_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h index 4012a86e4a1..f9b1a091ed6 100644 --- a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h +++ b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h @@ -45,10 +45,10 @@ public: int init (int argc, char *argv[] - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize the Notifier who plays the role of the server here. - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the ORB. virtual int handle_input (ACE_HANDLE); @@ -62,7 +62,7 @@ private: int parse_args (void); // Parses the command line arguments. - int init_naming_service (TAO_ENV_SINGLE_ARG_DECL); + int init_naming_service (ACE_ENV_SINGLE_ARG_DECL); // Initialises the name server and registers the Notifier object // name with the name server. diff --git a/TAO/examples/Callback_Quoter/Notifier_i.cpp b/TAO/examples/Callback_Quoter/Notifier_i.cpp index 470f4bf315b..632820180a4 100644 --- a/TAO/examples/Callback_Quoter/Notifier_i.cpp +++ b/TAO/examples/Callback_Quoter/Notifier_i.cpp @@ -38,7 +38,7 @@ void Notifier_i::register_callback (const char *stock_name, CORBA::Long threshold_value, Callback_Quoter::Consumer_ptr consumer_handler - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Callback_Quoter::Invalid_Stock)) { @@ -107,7 +107,7 @@ Notifier_i::orb (CORBA::ORB_ptr orb) void Notifier_i::unregister_callback (Callback_Quoter::Consumer_ptr consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Callback_Quoter::Invalid_Handle)) { @@ -154,7 +154,7 @@ Notifier_i::unregister_callback (Callback_Quoter::Consumer_ptr consumer void Notifier_i::market_status (const char *stock_name, CORBA::Long stock_value - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -202,7 +202,7 @@ Notifier_i::market_status (const char *stock_name, } void -Notifier_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Notifier_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { if ( this->consumer_map_.close () > 0) diff --git a/TAO/examples/Callback_Quoter/Notifier_i.h b/TAO/examples/Callback_Quoter/Notifier_i.h index d3d326e3e58..9c99934879e 100644 --- a/TAO/examples/Callback_Quoter/Notifier_i.h +++ b/TAO/examples/Callback_Quoter/Notifier_i.h @@ -52,28 +52,28 @@ public: virtual void register_callback (const char *stock_name, CORBA::Long threshold_value, Callback_Quoter::Consumer_ptr consumer_handler - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Callback_Quoter::Invalid_Stock)); // Register a distributed callback handler that is invoked when the // given stock reaches the desired threshold value. virtual void unregister_callback (Callback_Quoter::Consumer_ptr consumer_handler - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Callback_Quoter::Invalid_Handle)); // Remove the consumer object. virtual void market_status (const char *stock_name, CORBA::Long stock_value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Get the market status. void orb (CORBA::ORB_ptr orb); // Get the orb pointer. - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Shutdown the Notifier. diff --git a/TAO/examples/Callback_Quoter/Supplier_i.cpp b/TAO/examples/Callback_Quoter/Supplier_i.cpp index a01dec538d8..b3b3072d046 100644 --- a/TAO/examples/Callback_Quoter/Supplier_i.cpp +++ b/TAO/examples/Callback_Quoter/Supplier_i.cpp @@ -153,7 +153,7 @@ int Supplier::send_market_status (const char *stock_name, long value) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -161,7 +161,7 @@ Supplier::send_market_status (const char *stock_name, // Make the RMI. this->notifier_->market_status (stock_name, value - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) @@ -229,14 +229,14 @@ Supplier::via_naming_service (void) CORBA::Object_var notifier_obj = this->naming_services_client_->resolve (notifier_ref_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // The CORBA::Object_var object is downcast to Notifier_var // using the <_narrow> method. this->notifier_ = Notifier::_narrow (notifier_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) @@ -270,7 +270,7 @@ Supplier::init (int argc, char **argv) this->orb_ = CORBA::ORB_init (this->argc_, this->argv_, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse command line and verify parameters. @@ -294,7 +294,7 @@ Supplier::init (int argc, char **argv) -1); CORBA::Object_var notifier_object = this->orb_->string_to_object (this->ior_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (notifier_object.in ())) @@ -305,7 +305,7 @@ Supplier::init (int argc, char **argv) // The downcasting from CORBA::Object_var to Notifier_var is // done using the <_narrow> method. this->notifier_ = Notifier::_narrow (notifier_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) diff --git a/TAO/examples/Callback_Quoter/notifier.cpp b/TAO/examples/Callback_Quoter/notifier.cpp index 246f16e2ccd..44f07d70cd1 100644 --- a/TAO/examples/Callback_Quoter/notifier.cpp +++ b/TAO/examples/Callback_Quoter/notifier.cpp @@ -14,17 +14,17 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "\n\tNotifier\n\n")); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - int rc = notifier.init (argc, argv TAO_ENV_ARG_PARAMETER); + int rc = notifier.init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (rc == -1) return 1; else { - notifier.run (TAO_ENV_SINGLE_ARG_PARAMETER); + notifier.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp index a382f854632..9e64c8a1409 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp +++ b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp @@ -26,7 +26,7 @@ Content_Iterator_i::~Content_Iterator_i (void) CORBA::Boolean Content_Iterator_i::next_chunk (CORBA::ULong offset, Web_Server::Chunk_Type_out chunk - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // Initialize/allocate the Chunk_Type sequence @@ -105,23 +105,23 @@ Content_Iterator_i::next_chunk (CORBA::ULong offset, } void -Content_Iterator_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +Content_Iterator_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { (void) this->file_io_.close (); // Get the POA used when activating the Content_Iterator object. PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Get the object ID associated with this servant. PortableServer::ObjectId_var oid = - poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Now deactivate the iterator object. - poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Decrease the reference count on our selves. diff --git a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h index edf2fae0b71..bff3baf702a 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h +++ b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h @@ -63,12 +63,12 @@ public: virtual CORBA::Boolean next_chunk (CORBA::ULong offset, Web_Server::Chunk_Type_out chunk - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This operation returns the next <chunk> of the file starting at // <offset>. If there are no more bindings, false is returned. - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Destroy the iterator. diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp index b7bac2b09f6..50062c1baf1 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp +++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp @@ -12,7 +12,7 @@ void Iterator_Factory_i::get_iterator (const char *pathname, Web_Server::Content_Iterator_out contents, Web_Server::Metadata_Type_out metadata - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result)) { ACE_DEBUG ((LM_DEBUG, @@ -44,7 +44,7 @@ Iterator_Factory_i::get_iterator (const char *pathname, // Activate the Content_Iterator object. Web_Server::Content_Iterator_var iterator = - iterator_servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + iterator_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Web_Server::Metadata_Type *tmp = 0; diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h index 71599ff6347..93584967c63 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h +++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h @@ -45,7 +45,7 @@ public: virtual void get_iterator (const char *pathname, Web_Server::Content_Iterator_out contents, Web_Server::Metadata_Type_out metadata - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result)); // This factory method returns a <Content_Iterator> that can be used diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp index 46f896a5c8c..faa76c5bd5e 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp +++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp @@ -30,7 +30,7 @@ Iterator_Handler::~Iterator_Handler (void) void Iterator_Handler::next_chunk (CORBA::Boolean pending_data, const Web_Server::Chunk_Type &chunk_data - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (pending_data) @@ -53,7 +53,7 @@ Iterator_Handler::next_chunk (CORBA::Boolean pending_data, this->contents_->sendc_next_chunk (this->ami_handler_.in (), this->offset_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -67,7 +67,7 @@ Iterator_Handler::next_chunk (CORBA::Boolean pending_data, // Done with the iterator, so destroy it. this->contents_->sendc_destroy (this->ami_handler_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // File retrieval has completed, so spawn an external viewer to @@ -77,11 +77,11 @@ Iterator_Handler::next_chunk (CORBA::Boolean pending_data, } } void -Iterator_Handler::destroy (TAO_ENV_SINGLE_ARG_DECL) +Iterator_Handler::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Deactivate this reply handler. - this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -90,7 +90,7 @@ void Iterator_Handler::run (int *request_count, const char *pathname, Web_Server::Iterator_Factory_ptr factory - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result)) { @@ -102,17 +102,17 @@ Iterator_Handler::run (int *request_count, // Initialize the Content Iterator this->initialize_content_iterator (pathname, factory - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Activate this Reply Handler. - this->ami_handler_ = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->ami_handler_ = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Begin the asynchronous invocation. this->contents_->sendc_next_chunk (this->ami_handler_.in (), this->offset_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -120,7 +120,7 @@ void Iterator_Handler::initialize_content_iterator (const char *pathname, Web_Server::Iterator_Factory_ptr factory - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result)) { @@ -128,7 +128,7 @@ Iterator_Handler::initialize_content_iterator factory->get_iterator (pathname, this->contents_, this->metadata_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Create a temporary file to store the retrieved data. @@ -149,21 +149,21 @@ Iterator_Handler::initialize_content_iterator } void -Iterator_Handler::deactivate (TAO_ENV_SINGLE_ARG_DECL) +Iterator_Handler::deactivate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Get the POA used when activating the Reply Handler object. PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Get the object ID associated with this servant. PortableServer::ObjectId_var oid = - poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Now deactivate the iterator object. - poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h index e64986ca215..2aee54552da 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h +++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h @@ -64,26 +64,26 @@ public: virtual void next_chunk (CORBA::Boolean pending_data, const Web_Server::Chunk_Type & chunk - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void next_chunk_excep ( Web_Server::AMI_Content_IteratorExceptionHolder * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) {} - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void destroy_excep ( Web_Server::AMI_Content_IteratorExceptionHolder * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) {} void run (int *request_count, const char *pathname, Web_Server::Iterator_Factory_ptr factory - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result)); // Activate and run this Reply Handler. The contents (not the @@ -98,12 +98,12 @@ private: void initialize_content_iterator (const char *pathname, Web_Server::Iterator_Factory_ptr factory - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result)); // Initialize the Content Iterator used to retrieve the file. - void deactivate (TAO_ENV_SINGLE_ARG_DECL) + void deactivate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Deactivate this reply handler. diff --git a/TAO/examples/Content_Server/AMI_Iterator/client.cpp b/TAO/examples/Content_Server/AMI_Iterator/client.cpp index 3ac86a85b96..756603eaf7a 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/client.cpp +++ b/TAO/examples/Content_Server/AMI_Iterator/client.cpp @@ -13,19 +13,19 @@ ACE_RCSID (AMI_Iterator, client, "$Id$") // Obtain reference to Iterator_Factory Web_Server::Iterator_Factory_ptr get_iterator (CORBA::ORB_ptr orb - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Perform file requests void invoke_requests (int argc, char *argv[], int *request_count, Web_Server::Iterator_Factory_ptr f - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); int main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { if (argc < 2) @@ -37,28 +37,28 @@ main (int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "Mighty ORB" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the Root POA. 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); + PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Activate the POA manager. PortableServer::POAManager_var mgr = poa->the_POAManager (); - mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Get an Iterator_Factory reference. Web_Server::Iterator_Factory_var factory = ::get_iterator (orb.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (factory.in ())) @@ -80,7 +80,7 @@ main (int argc, char *argv[]) argv, &request_count, factory.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Run the ORB event loop. @@ -88,22 +88,22 @@ main (int argc, char *argv[]) { CORBA::Boolean more_work; - more_work = orb->work_pending (TAO_ENV_SINGLE_ARG_PARAMETER); + more_work = orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (more_work) { - orb->perform_work (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } else ACE_OS::sleep (tv); } - orb->shutdown (0 TAO_ENV_ARG_PARAMETER); + orb->shutdown (0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (Web_Server::Error_Result, exc) @@ -131,19 +131,19 @@ main (int argc, char *argv[]) Web_Server::Iterator_Factory_ptr get_iterator (CORBA::ORB_ptr o - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::ORB_var orb = CORBA::ORB::_duplicate (o); // Get a reference to the Name Service. CORBA::Object_var obj = orb->resolve_initial_references ("NameService" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Web_Server::Iterator_Factory::_nil ()); // Narrow to a Naming Context CosNaming::NamingContext_var nc = - CosNaming::NamingContext::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + CosNaming::NamingContext::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Web_Server::Iterator_Factory::_nil ()); if (CORBA::is_nil (obj.in ())) @@ -159,7 +159,7 @@ get_iterator (CORBA::ORB_ptr o name[0].id = CORBA::string_dup ("Iterator_Factory"); name[0].kind = CORBA::string_dup (""); - obj = nc->resolve (name TAO_ENV_ARG_PARAMETER); + obj = nc->resolve (name ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Web_Server::Iterator_Factory::_nil ()); Web_Server::Iterator_Factory_ptr factory = @@ -172,7 +172,7 @@ void invoke_requests (int argc, char *argv[], int *request_count, Web_Server::Iterator_Factory_ptr f - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { Web_Server::Iterator_Factory_var factory = Web_Server::Iterator_Factory::_duplicate (f); @@ -195,7 +195,7 @@ void invoke_requests (int argc, handler->run (request_count, argv[i + 1], factory.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } diff --git a/TAO/examples/Content_Server/AMI_Iterator/server.cpp b/TAO/examples/Content_Server/AMI_Iterator/server.cpp index c711edf8594..fab8f391270 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/server.cpp +++ b/TAO/examples/Content_Server/AMI_Iterator/server.cpp @@ -13,46 +13,46 @@ ACE_RCSID (AMI_Iterator, server, "$Id$") int main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "Mighty ORB" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the Root POA. 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); + PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Activate the POA manager. PortableServer::POAManager_var mgr = poa->the_POAManager (); - mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Create the Iterator_Factory servant and object. // It activates and deactivates the Content_Iterator object. Iterator_Factory_i factory_servant; Web_Server::Iterator_Factory_var factory = - factory_servant._this (TAO_ENV_SINGLE_ARG_PARAMETER); + factory_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Get a reference to the Name Service. obj = orb->resolve_initial_references ("NameService" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow to a Naming Context CosNaming::NamingContext_var nc = - CosNaming::NamingContext::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + CosNaming::NamingContext::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create a name. @@ -61,12 +61,12 @@ main (int argc, char *argv[]) name[0].id = CORBA::string_dup ("Iterator_Factory"); name[0].kind = CORBA::string_dup (""); - nc->bind (name, factory.in () TAO_ENV_ARG_PARAMETER); + nc->bind (name, factory.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Some debugging output. CORBA::String_var IOR = orb->object_to_string (factory.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Bound <%s> to <%s> in Name Service.\n"), @@ -77,7 +77,7 @@ main (int argc, char *argv[]) ACE_TEXT ("Accepting requests.\n"))); // Accept requests. - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp index 61774035f58..d26e6b5569c 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp +++ b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp @@ -28,12 +28,12 @@ Callback_Handler::~Callback_Handler (void) } void -Callback_Handler::next_chunk (TAO_ENV_SINGLE_ARG_DECL) +Callback_Handler::next_chunk (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->last_chunk_ == 1) { - this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; return; @@ -80,25 +80,25 @@ Callback_Handler::next_chunk (TAO_ENV_SINGLE_ARG_DECL) this->callback_->sendc_next_chunk (this->ami_handler_.in (), this->chunk_.in (), this->last_chunk_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void Callback_Handler::next_chunk_excep (Web_Server::AMI_CallbackExceptionHolder *excep_holder - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->last_chunk_ = 1; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - excep_holder->raise_next_chunk (TAO_ENV_SINGLE_ARG_PARAMETER); + excep_holder->raise_next_chunk (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -111,27 +111,27 @@ Callback_Handler::next_chunk_excep } void -Callback_Handler::run (TAO_ENV_SINGLE_ARG_DECL) +Callback_Handler::run (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result)) { // Open the file to be downloaded - this->open_file (TAO_ENV_SINGLE_ARG_PARAMETER); + this->open_file (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Activate this Reply Handler. - this->ami_handler_ = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->ami_handler_ = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Begin the asynchronous invocation. Note that the AMI // "sendc_next_chunk()" call is done within the following call, // since data must first be read into the Chunk. - this->next_chunk (TAO_ENV_SINGLE_ARG_PARAMETER); + this->next_chunk (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Callback_Handler::open_file (TAO_ENV_SINGLE_ARG_DECL) +Callback_Handler::open_file (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result)) { @@ -149,23 +149,23 @@ Callback_Handler::open_file (TAO_ENV_SINGLE_ARG_DECL) } void -Callback_Handler::deactivate (TAO_ENV_SINGLE_ARG_DECL) +Callback_Handler::deactivate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Close the file that was sent to the client. (void) this->file_io_.close (); // Get the POA used when activating the Reply Handler object. - PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Get the object ID associated with this servant. PortableServer::ObjectId_var oid = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Now deactivate the AMI_CallbackHandler object. - poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h index fe87b50c854..d65c2968650 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h +++ b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h @@ -87,15 +87,15 @@ public: // Constructor that creates a content iterator corresponding to the // name of the file being retrieved from the web server. - virtual void next_chunk (TAO_ENV_SINGLE_ARG_DECL) + virtual void next_chunk (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // The callback for this reply handler. virtual void next_chunk_excep (Web_Server::AMI_CallbackExceptionHolder * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void run (TAO_ENV_SINGLE_ARG_DECL) + void run (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result)); // Activate and run this Reply Handler. The contents (not the @@ -108,12 +108,12 @@ private: // Destructor (private to ensure that Callback_Handler is allocated // on the heap). - void open_file (TAO_ENV_SINGLE_ARG_DECL) + void open_file (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result)); // Open the file to be uploaded to the client callback. - void deactivate (TAO_ENV_SINGLE_ARG_DECL) + void deactivate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Deactivate this reply handler. diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp b/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp index a6299288c56..2f52e21c41c 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp +++ b/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp @@ -47,7 +47,7 @@ Callback_i::~Callback_i (void) void Callback_i::next_chunk (const Web_Server::Chunk_Type & chunk_data, CORBA::Boolean last_chunk - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (!last_chunk) @@ -93,7 +93,7 @@ Callback_i::next_chunk (const Web_Server::Chunk_Type & chunk_data, if (this->metadata_received ()) { (void) this->file_io_.close (); - this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; (void) this->spawn_viewer (); @@ -104,7 +104,7 @@ Callback_i::next_chunk (const Web_Server::Chunk_Type & chunk_data, void Callback_i::metadata (const Web_Server::Metadata_Type &metadata) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { { @@ -126,7 +126,7 @@ Callback_i::metadata (const Web_Server::Metadata_Type &metadata) // an external viewer to display it. if (this->content_received ()) { - this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; (void) this->spawn_viewer (); @@ -273,19 +273,19 @@ Callback_i::spawn_viewer (void) } void -Callback_i::deactivate (TAO_ENV_SINGLE_ARG_DECL) +Callback_i::deactivate (ACE_ENV_SINGLE_ARG_DECL) { // Get the POA used when activating the Reply Handler object. - PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Get the object ID associated with this servant. PortableServer::ObjectId_var oid = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Now deactivate the iterator object. - poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_i.h b/TAO/examples/Content_Server/AMI_Observer/Callback_i.h index 7a9ea118094..19625ed64a8 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Callback_i.h +++ b/TAO/examples/Content_Server/AMI_Observer/Callback_i.h @@ -72,7 +72,7 @@ public: virtual void next_chunk (const Web_Server::Chunk_Type &chunk, CORBA::Boolean last_chunk - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This operation returns the next <chunk> of the file starting at // <offset>. If there are no more bindings, false is returned. @@ -102,7 +102,7 @@ private: private: - void deactivate (TAO_ENV_SINGLE_ARG_DECL); + void deactivate (ACE_ENV_SINGLE_ARG_DECL); // Deactivate this Callback servant. private: diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp index aa7b3e0e064..ba648843736 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp +++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp @@ -12,7 +12,7 @@ Web_Server::Metadata_Type * Push_Iterator_Factory_i::register_callback (const char *pathname, Web_Server::Callback_ptr client_callback - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result)) { if (CORBA::is_nil (client_callback)) // @@ Will it ever be nil? @@ -43,7 +43,7 @@ Push_Iterator_Factory_i::register_callback PortableServer::ServantBase_var tmp (handler); // Start sending data to the client callback object. - handler->run (TAO_ENV_SINGLE_ARG_PARAMETER); + handler->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_stat file_status; diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.h b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.h index ee2d114c915..4870062e7e9 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.h +++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.h @@ -53,7 +53,7 @@ public: Web_Server::Metadata_Type *register_callback (const char *pathname, Web_Server::Callback_ptr client_callback - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result)); // This registration method passes a <Callback> that the Web server diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp index f2b0cee21e2..96a7b7c0b88 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp +++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp @@ -26,13 +26,13 @@ Push_Iterator_Handler::~Push_Iterator_Handler (void) void Push_Iterator_Handler::register_callback (const Web_Server::Metadata_Type &metadata - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { this->callback_servant_->metadata (metadata); // This handler is no longer needed, so deactivate it. - this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -40,7 +40,7 @@ void Push_Iterator_Handler::run (int *request_count, const char *pathname, Web_Server::Iterator_Factory_ptr factory - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result)) { @@ -54,37 +54,37 @@ Push_Iterator_Handler::run (int *request_count, // Activate the Callback. this->callback_ = - this->callback_servant_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->callback_servant_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Activate this Reply Handler. this->ami_handler_ = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Register the client callback with the server asynchronously. factory->sendc_register_callback (this->ami_handler_.in (), pathname, this->callback_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -Push_Iterator_Handler::deactivate (TAO_ENV_SINGLE_ARG_DECL) +Push_Iterator_Handler::deactivate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Get the POA used when activating the Reply Handler object. - PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Get the object ID associated with this servant. PortableServer::ObjectId_var oid = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Now deactivate the AMI_CallbackHandler object. - poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h index caa91026a62..e1b04c94f5a 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h +++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h @@ -73,7 +73,7 @@ public: void run (int *request_count, const char *pathname, Web_Server::Iterator_Factory_ptr factory - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result)); // Activate and run this Reply Handler. The contents (not the @@ -89,17 +89,17 @@ private: virtual void register_callback (const Web_Server::Metadata_Type &metadata - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // AMI callback that is invoked when a response from the // corresponding server method is received. virtual void register_callback_excep (Web_Server::AMI_Iterator_FactoryExceptionHolder * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) {} - void deactivate (TAO_ENV_SINGLE_ARG_DECL) + void deactivate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Deactivate this handler. diff --git a/TAO/examples/Content_Server/AMI_Observer/client.cpp b/TAO/examples/Content_Server/AMI_Observer/client.cpp index 306a86b7910..9c0465ac1c1 100644 --- a/TAO/examples/Content_Server/AMI_Observer/client.cpp +++ b/TAO/examples/Content_Server/AMI_Observer/client.cpp @@ -13,19 +13,19 @@ ACE_RCSID (AMI_Observer, client, "$Id$") // Obtain reference to Iterator_Factory Web_Server::Iterator_Factory_ptr get_iterator (CORBA::ORB_ptr orb - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Perform file requests void invoke_requests (int argc, char *argv[], int *request_count, Web_Server::Iterator_Factory_ptr f - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); int main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { if (argc < 2) @@ -38,28 +38,28 @@ main (int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "Mighty ORB" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the Root POA. 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); + PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Activate the POA manager. PortableServer::POAManager_var mgr = poa->the_POAManager (); - mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Get an Iterator_Factory reference. Web_Server::Iterator_Factory_var factory = ::get_iterator (orb.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (factory.in ())) @@ -81,7 +81,7 @@ main (int argc, char *argv[]) argv, &request_count, factory.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // 1 millisecond delay to reduce "busy waiting" in ORB event @@ -93,22 +93,22 @@ main (int argc, char *argv[]) { CORBA::Boolean more_work; - more_work = orb->work_pending (TAO_ENV_SINGLE_ARG_PARAMETER); + more_work = orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (more_work) { - orb->perform_work (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } else ACE_OS::sleep (tv); } - orb->shutdown (0 TAO_ENV_ARG_PARAMETER); + orb->shutdown (0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - //orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + //orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); //ACE_TRY_CHECK; } ACE_CATCH (Web_Server::Error_Result, exc) @@ -136,19 +136,19 @@ main (int argc, char *argv[]) Web_Server::Iterator_Factory_ptr get_iterator (CORBA::ORB_ptr o - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::ORB_var orb = CORBA::ORB::_duplicate (o); // Get a reference to the Name Service. CORBA::Object_var obj = orb->resolve_initial_references ("NameService" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Web_Server::Iterator_Factory::_nil ()); // Narrow to a Naming Context CosNaming::NamingContext_var nc = - CosNaming::NamingContext::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + CosNaming::NamingContext::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Web_Server::Iterator_Factory::_nil ()); if (CORBA::is_nil (obj.in ())) @@ -164,7 +164,7 @@ get_iterator (CORBA::ORB_ptr o name[0].id = CORBA::string_dup ("Push_Iterator_Factory"); name[0].kind = CORBA::string_dup (""); - obj = nc->resolve (name TAO_ENV_ARG_PARAMETER); + obj = nc->resolve (name ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Web_Server::Iterator_Factory::_nil ()); Web_Server::Iterator_Factory_ptr factory = @@ -177,7 +177,7 @@ void invoke_requests (int argc, char *argv[], int *request_count, Web_Server::Iterator_Factory_ptr f - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { Web_Server::Iterator_Factory_var factory = Web_Server::Iterator_Factory::_duplicate (f); @@ -200,7 +200,7 @@ void invoke_requests (int argc, handler->run (request_count, argv[i + 1], factory.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } diff --git a/TAO/examples/Content_Server/AMI_Observer/server.cpp b/TAO/examples/Content_Server/AMI_Observer/server.cpp index 5a59ffd5e91..55854e56c83 100644 --- a/TAO/examples/Content_Server/AMI_Observer/server.cpp +++ b/TAO/examples/Content_Server/AMI_Observer/server.cpp @@ -12,45 +12,45 @@ ACE_RCSID (AMI_Observer, server, "$Id$") int main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "Mighty ORB" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the Root POA. 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); + PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Activate the POA manager. PortableServer::POAManager_var mgr = poa->the_POAManager (); - mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Create the Iterator_Factory servant and object. Push_Iterator_Factory_i factory_servant; Web_Server::Iterator_Factory_var factory = - factory_servant._this (TAO_ENV_SINGLE_ARG_PARAMETER); + factory_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Get a reference to the Name Service. obj = orb->resolve_initial_references ("NameService" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow to a Naming Context CosNaming::NamingContext_var nc = - CosNaming::NamingContext::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + CosNaming::NamingContext::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create a name. @@ -59,12 +59,12 @@ main (int argc, char *argv[]) name[0].id = CORBA::string_dup ("Push_Iterator_Factory"); name[0].kind = CORBA::string_dup (""); - nc->bind (name, factory.in () TAO_ENV_ARG_PARAMETER); + nc->bind (name, factory.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Some debugging output. CORBA::String_var IOR = orb->object_to_string (factory.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Bound <%s> to <%s> in Name Service.\n"), @@ -75,7 +75,7 @@ main (int argc, char *argv[]) ACE_TEXT ("Accepting requests.\n"))); // Accept requests. - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp index ffa637debb2..1f60aaaea0f 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp +++ b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp @@ -27,7 +27,7 @@ Content_Iterator_i::~Content_Iterator_i (void) CORBA::Boolean Content_Iterator_i::next_chunk (CORBA::ULong offset, Web_Server::Chunk_Type_out chunk - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Initialize/allocate the Chunk_Type sequence @@ -117,23 +117,23 @@ Content_Iterator_i::next_chunk (CORBA::ULong offset, } void -Content_Iterator_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +Content_Iterator_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { (void) this->file_io_.close (); // Get the POA used when activating the Content_Iterator object. - PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Get the object ID associated with this servant. PortableServer::ObjectId_var oid = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Now deactivate the iterator object. - poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Decrease the reference count on our selves. diff --git a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h index 09bbfa3ddc0..5dbc57a999b 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h +++ b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h @@ -63,12 +63,12 @@ public: virtual CORBA::Boolean next_chunk (CORBA::ULong offset, Web_Server::Chunk_Type_out chunk - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This operation returns the next <chunk> of the file starting at // <offset>. If there are no more bindings, false is returned. - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Destroy the iterator. diff --git a/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp b/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp index 4257ddb5581..9fc9c724f24 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp +++ b/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp @@ -12,7 +12,7 @@ void Iterator_Factory_i::get_iterator (const char *pathname, Web_Server::Content_Iterator_out contents, Web_Server::Metadata_Type_out metadata - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result)) { ACE_DEBUG ((LM_DEBUG, @@ -50,7 +50,7 @@ Iterator_Factory_i::get_iterator (const char *pathname, // Activate the Content_Iterator object. Web_Server::Content_Iterator_var iterator = - iterator_servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + iterator_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Web_Server::Metadata_Type *tmp = 0; diff --git a/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h b/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h index adad7bc5b1e..5b879e0dd85 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h +++ b/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h @@ -47,7 +47,7 @@ public: virtual void get_iterator (const char *pathname, Web_Server::Content_Iterator_out contents, Web_Server::Metadata_Type_out metadata - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result)); // This factory method returns a <Content_Iterator> that can be used diff --git a/TAO/examples/Content_Server/SMI_Iterator/client.cpp b/TAO/examples/Content_Server/SMI_Iterator/client.cpp index c6c3e47d613..7c8cb92ce27 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/client.cpp +++ b/TAO/examples/Content_Server/SMI_Iterator/client.cpp @@ -14,7 +14,7 @@ ACE_RCSID(SMI_Iterator, client, "$Id$") // Retrieve the data from the server int retrieve_data (const char *content_type, Web_Server::Content_Iterator_ptr contents - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Map content type to viewer. @@ -29,7 +29,7 @@ int spawn_viewer (const char *content_type, int main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { if (argc < 2) @@ -41,18 +41,18 @@ main (int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "Mighty ORB" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get a reference to the Name Service. CORBA::Object_var obj = orb->resolve_initial_references ("NameService" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow to a Naming Context CosNaming::NamingContext_var nc = - CosNaming::NamingContext::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + CosNaming::NamingContext::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (obj.in ())) @@ -69,7 +69,7 @@ main (int argc, char *argv[]) name[0].id = CORBA::string_dup ("Iterator_Factory"); name[0].kind = CORBA::string_dup (""); - obj = nc->resolve (name TAO_ENV_ARG_PARAMETER); + obj = nc->resolve (name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Now narrow to an Iterator_Factory reference. @@ -93,7 +93,7 @@ main (int argc, char *argv[]) factory->get_iterator (pathname, contents, metadata - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_INFO, @@ -107,20 +107,20 @@ main (int argc, char *argv[]) int result = ::retrieve_data (metadata->content_type.in (), contents.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result != 0) return -1; // Done with the Content_Iterator, so destroy it. - contents->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + contents->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->shutdown (0 TAO_ENV_ARG_PARAMETER); + orb->shutdown (0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - // orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + // orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); // ACE_TRY_CHECK; } ACE_CATCH (Web_Server::Error_Result, exc) @@ -149,7 +149,7 @@ main (int argc, char *argv[]) int retrieve_data (const char *content_type, Web_Server::Content_Iterator_ptr iterator - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { Web_Server::Content_Iterator_var contents = Web_Server::Content_Iterator::_duplicate (iterator); @@ -179,7 +179,7 @@ int retrieve_data (const char *content_type, for (;;) { - rc = contents->next_chunk (offset, chunk TAO_ENV_ARG_PARAMETER); + rc = contents->next_chunk (offset, chunk ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (!rc) diff --git a/TAO/examples/Content_Server/SMI_Iterator/server.cpp b/TAO/examples/Content_Server/SMI_Iterator/server.cpp index 0ff14a044c1..733b3e71dfc 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/server.cpp +++ b/TAO/examples/Content_Server/SMI_Iterator/server.cpp @@ -13,46 +13,46 @@ ACE_RCSID(SMI_Iterator, server, "$Id$") int main (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB. CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "Mighty ORB" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the Root POA. 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); + PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Activate the POA manager. PortableServer::POAManager_var mgr = poa->the_POAManager (); - mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Create the Iterator_Factory servant and object. // It activates and deactivates the Content_Iterator object. Iterator_Factory_i factory_servant; Web_Server::Iterator_Factory_var factory = - factory_servant._this (TAO_ENV_SINGLE_ARG_PARAMETER); + factory_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Get a reference to the Name Service. obj = orb->resolve_initial_references ("NameService" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow to a Naming Context CosNaming::NamingContext_var nc; - nc = CosNaming::NamingContext::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + nc = CosNaming::NamingContext::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create a name. @@ -61,12 +61,12 @@ main (int argc, char *argv[]) name[0].id = CORBA::string_dup ("Iterator_Factory"); name[0].kind = CORBA::string_dup (""); - nc->bind (name, factory.in () TAO_ENV_ARG_PARAMETER); + nc->bind (name, factory.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Some debugging output. CORBA::String_var IOR = orb->object_to_string (factory.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Bound <%s> to <%s> in Name Service.\n"), @@ -77,7 +77,7 @@ main (int argc, char *argv[]) ACE_TEXT ("Accepting requests.\n"))); // Accept requests. - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Event_Comm/Consumer_Handler.cpp b/TAO/examples/Event_Comm/Consumer_Handler.cpp index cc5c529d9ca..b71951cf34b 100644 --- a/TAO/examples/Event_Comm/Consumer_Handler.cpp +++ b/TAO/examples/Event_Comm/Consumer_Handler.cpp @@ -39,24 +39,24 @@ Consumer_Handler::init (int argc, this->orb_ = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = this->orb_->resolve_initial_references("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = PortableServer::POA::_narrow (poa_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + 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; // Save the Shutdown callback. @@ -67,7 +67,7 @@ Consumer_Handler::init (int argc, // Start the servant. this->receiver_ = - this->receiver_i_._this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->receiver_i_._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -80,7 +80,7 @@ Consumer_Handler::init (int argc, // Subscribe ourselves with the notifier's broker. this->notifier_->subscribe (this->receiver_.in (), filtering_criteria - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_CATCHANY { @@ -111,14 +111,14 @@ Consumer_Handler::get_notifier (void) CORBA::Object_var notifier_obj = this->naming_services_client_->resolve (notifier_ref_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // The CORBA::Object_var object is downcast to Notifier_var // using the <_narrow> method. this->notifier_ = Event_Comm::Notifier::_narrow (notifier_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -153,10 +153,10 @@ Consumer_Handler::run (void) "Running the Consumer...\n")); // Run the ORB. - 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 diff --git a/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp b/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp index 56c065f735e..697408dfa36 100644 --- a/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp +++ b/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp @@ -55,7 +55,7 @@ Consumer_Input_Handler::close (void) if (notifier != 0) notifier->unsubscribe (receiver, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -138,7 +138,7 @@ Consumer_Input_Handler::handle_input (ACE_HANDLE h) event.tag_ = ACE_OS::strdup (buf); - notifier->push (event TAO_ENV_ARG_PARAMETER); + notifier->push (event ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Event_Comm/Event_Comm_i.cpp b/TAO/examples/Event_Comm/Event_Comm_i.cpp index ece9cc4de9f..d9d7cad9412 100644 --- a/TAO/examples/Event_Comm/Event_Comm_i.cpp +++ b/TAO/examples/Event_Comm/Event_Comm_i.cpp @@ -157,7 +157,7 @@ The filtering criteria will not work.\n")); void Notifier_i::subscribe (Event_Comm::Consumer_ptr consumer_ref, const char *filtering_criteria - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, Event_Comm::Notifier::CannotSubscribe @@ -219,7 +219,7 @@ Notifier_i::subscribe (Event_Comm::Consumer_ptr consumer_ref, void Notifier_i::unsubscribe (Event_Comm::Consumer_ptr consumer_ref, const char *filtering_criteria - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, Event_Comm::Notifier::CannotUnsubscribe @@ -275,7 +275,7 @@ Notifier_i::unsubscribe (Event_Comm::Consumer_ptr consumer_ref, void Notifier_i::disconnect (const char *reason - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -302,7 +302,7 @@ Notifier_i::disconnect (const char *reason ACE_TRY { consumer_ref->disconnect (reason - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -330,7 +330,7 @@ Notifier_i::disconnect (const char *reason void Notifier_i::push (const Event_Comm::Event &event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -368,7 +368,7 @@ Notifier_i::push (const Event_Comm::Event &event ACE_TRY { consumer_ref->push (event - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -405,7 +405,7 @@ Consumer_i::~Consumer_i (void) void Consumer_i::push (const Event_Comm::Event &event - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { const char *tmpstr = event.tag_; @@ -420,7 +420,7 @@ Consumer_i::push (const Event_Comm::Event &event void Consumer_i::disconnect (const char *reason - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/examples/Event_Comm/Event_Comm_i.h b/TAO/examples/Event_Comm/Event_Comm_i.h index ec27c355bab..e58adc4da1d 100644 --- a/TAO/examples/Event_Comm/Event_Comm_i.h +++ b/TAO/examples/Event_Comm/Event_Comm_i.h @@ -57,12 +57,12 @@ public: // set the <ACE_Reactor> to use when quitting. virtual void push (const Event_Comm::Event & event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Pass the <event> to the <Consumer>. virtual void disconnect (const char * reason - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Disconnect the <Consumer> from the <Notifier>, giving it the @@ -94,19 +94,19 @@ public: // Initialize a Notifier_i object with the specified size hint. virtual void disconnect (const char *reason - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Disconnect all the receivers, giving them the <reason>. virtual void push (const Event_Comm::Event &event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Send the <event> to all the consumers who have subscribed and who // match the filtering criteria. virtual void subscribe (Event_Comm::Consumer_ptr Consumer, const char * filtering_criteria - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, Event_Comm::Notifier::CannotSubscribe @@ -116,7 +116,7 @@ public: void unsubscribe (Event_Comm::Consumer *consumer, const char *filtering_criteria - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, Event_Comm::Notifier::CannotUnsubscribe diff --git a/TAO/examples/Event_Comm/Notifier_Handler.cpp b/TAO/examples/Event_Comm/Notifier_Handler.cpp index f540f1fd367..b2cb6b53f94 100644 --- a/TAO/examples/Event_Comm/Notifier_Handler.cpp +++ b/TAO/examples/Event_Comm/Notifier_Handler.cpp @@ -91,24 +91,24 @@ Notifier_Handler::init (int argc, this->orb_ = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = this->orb_->resolve_initial_references("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = PortableServer::POA::_narrow (poa_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + 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; // Initialization of the naming service. @@ -125,7 +125,7 @@ Notifier_Handler::init (int argc, CORBA::Object_var notifier_obj = this->naming_client_->resolve (notifier_ref_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -133,7 +133,7 @@ Notifier_Handler::init (int argc, // using the <_narrow> method. this->notifier_ = Event_Comm::Notifier::_narrow (notifier_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Event_Comm/Notifier_Server.cpp b/TAO/examples/Event_Comm/Notifier_Server.cpp index 40451d57576..fb57174dff1 100644 --- a/TAO/examples/Event_Comm/Notifier_Server.cpp +++ b/TAO/examples/Event_Comm/Notifier_Server.cpp @@ -28,7 +28,7 @@ Notifier_Server::close (void) { // disconnect all the consumers. this->servant_.disconnect ("notifier shutdown." - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Name the object. @@ -38,7 +38,7 @@ Notifier_Server::close (void) CORBA::string_dup (NOTIFIER_BIND_NAME); this->naming_server_->unbind (notifier_obj_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Instruct the ORB to shutdown. @@ -57,7 +57,7 @@ Notifier_Server::close (void) // the object name is bound to the naming server. int -Notifier_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) +Notifier_Server::init_naming_service (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { @@ -76,7 +76,7 @@ Notifier_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) // Register the object implementation with the POA. Event_Comm::Notifier_var notifier_obj = - this->servant_._this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->servant_._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Name the object. @@ -89,7 +89,7 @@ Notifier_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) // Now, attach the object name to the context. this->naming_server_->bind (notifier_obj_name, notifier_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -108,7 +108,7 @@ Notifier_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) int Notifier_Server::init (int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Call the init of <TAO_ORB_Manager> to initialize the ORB and // create the child poa under the root POA. @@ -116,7 +116,7 @@ Notifier_Server::init (int argc, if (this->orb_manager_.init_child_poa (argc, argv, "child_poa" - TAO_ENV_ARG_PARAMETER) == -1) + ACE_ENV_ARG_PARAMETER) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", @@ -124,26 +124,26 @@ Notifier_Server::init (int argc, -1); ACE_CHECK_RETURN (-1); - this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Activate the servant in the POA. CORBA::String_var str = this->orb_manager_.activate_under_child_poa (NOTIFIER_BIND_NAME, &this->servant_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); - return this->init_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->init_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER); } int -Notifier_Server::run (TAO_ENV_SINGLE_ARG_DECL) +Notifier_Server::run (ACE_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "Running the notifier server...\n")); // Run the main event loop for the ORB. - this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; diff --git a/TAO/examples/Event_Comm/Notifier_Server.h b/TAO/examples/Event_Comm/Notifier_Server.h index 8f09294582d..e5f3f38b8e1 100644 --- a/TAO/examples/Event_Comm/Notifier_Server.h +++ b/TAO/examples/Event_Comm/Notifier_Server.h @@ -35,10 +35,10 @@ public: ~Notifier_Server (void); // Destructor. - int init (int argc, char *argv[] TAO_ENV_ARG_DECL); + int init (int argc, char *argv[] ACE_ENV_ARG_DECL); // Initialize the Server state. - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the orb. int close (void); @@ -48,7 +48,7 @@ public: // Reactor accessor. private: - int init_naming_service (TAO_ENV_SINGLE_ARG_DECL); + int init_naming_service (ACE_ENV_SINGLE_ARG_DECL); // Initialises the name server and registers the Notifier server // object name with the name server. diff --git a/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp b/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp index 64953cb2dbb..73847bd2ce9 100644 --- a/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp +++ b/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp @@ -109,7 +109,7 @@ Supplier_Input_Handler::handle_input (ACE_HANDLE) // reference... event.value_ = ... // Forward <Event> to all <Consumers>. - notifier->push (event TAO_ENV_ARG_PARAMETER); + notifier->push (event ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Event_Comm/notifier.cpp b/TAO/examples/Event_Comm/notifier.cpp index bb8ea19c6fb..8e348b1df5b 100644 --- a/TAO/examples/Event_Comm/notifier.cpp +++ b/TAO/examples/Event_Comm/notifier.cpp @@ -22,7 +22,7 @@ Notifier::run (void) { ACE_TRY_NEW_ENV { - ns_.run (TAO_ENV_SINGLE_ARG_PARAMETER); + ns_.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -36,7 +36,7 @@ Notifier::Notifier (int argc, char *argv[]) { ACE_TRY_NEW_ENV { - ns_.init (argc, argv TAO_ENV_ARG_PARAMETER); + ns_.init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Load_Balancing/Identity_Client.cpp b/TAO/examples/Load_Balancing/Identity_Client.cpp index 70f499475d3..4fb31825759 100644 --- a/TAO/examples/Load_Balancing/Identity_Client.cpp +++ b/TAO/examples/Load_Balancing/Identity_Client.cpp @@ -73,12 +73,12 @@ Identity_Client::init (int argc, { int result; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { result = this->orb_manager_.init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) return result; @@ -100,7 +100,7 @@ Identity_Client::init (int argc, } int -Identity_Client::run (TAO_ENV_SINGLE_ARG_DECL) +Identity_Client::run (ACE_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "Identity_Client: Initialized \n")); @@ -108,11 +108,11 @@ Identity_Client::run (TAO_ENV_SINGLE_ARG_DECL) CORBA::ORB_var orb = orb_manager_.orb (); CORBA::Object_var obj = orb->string_to_object (this->group_factory_ior_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); Load_Balancer::Object_Group_Factory_var factory = Load_Balancer::Object_Group_Factory::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (CORBA::is_nil (factory.in ())) @@ -131,11 +131,11 @@ Identity_Client::run (TAO_ENV_SINGLE_ARG_DECL) "with id <%s>\n", group_name)); Load_Balancer::Object_Group_var object_group = factory->resolve (group_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // List <Object_Group>'s id. - CORBA::String_var id = object_group->id (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var id = object_group->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (ACE_OS::strcmp (id.in (), group_name) != 0) @@ -150,7 +150,7 @@ Identity_Client::run (TAO_ENV_SINGLE_ARG_DECL) group_name)); Load_Balancer::Member_ID_List_var id_list = - object_group->members (TAO_ENV_SINGLE_ARG_PARAMETER); + object_group->members (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, @@ -177,11 +177,11 @@ Identity_Client::run (TAO_ENV_SINGLE_ARG_DECL) for (size_t ind = 0; ind < this->number_of_invocations_; ++ind) { - obj = object_group->resolve (TAO_ENV_SINGLE_ARG_PARAMETER); + obj = object_group->resolve (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); identity_object = Identity::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (CORBA::is_nil (identity_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -189,7 +189,7 @@ Identity_Client::run (TAO_ENV_SINGLE_ARG_DECL) "<Object_Group::resolve> to <Identity>\n"), -1); identity_object->get_name (identity.out () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } @@ -212,10 +212,10 @@ main (int argc, char *argv[]) if (client.init (argc, argv) == -1) return 1; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - result = client.run (TAO_ENV_SINGLE_ARG_PARAMETER); + result = client.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Load_Balancing/Identity_Client.h b/TAO/examples/Load_Balancing/Identity_Client.h index 86b76d1bfc3..371c41c17bd 100644 --- a/TAO/examples/Load_Balancing/Identity_Client.h +++ b/TAO/examples/Load_Balancing/Identity_Client.h @@ -54,7 +54,7 @@ public: int init (int argc, char *argv[]); // Initializes <orb_manager_>, and parses commandline arguments. - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // See TITLE. private: diff --git a/TAO/examples/Load_Balancing/Identity_Server.cpp b/TAO/examples/Load_Balancing/Identity_Server.cpp index 27640d49433..dfc94035395 100644 --- a/TAO/examples/Load_Balancing/Identity_Server.cpp +++ b/TAO/examples/Load_Balancing/Identity_Server.cpp @@ -69,12 +69,12 @@ Identity_Server::init (int argc, { int result; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { result = this->orb_manager_.init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) return result; @@ -89,11 +89,11 @@ Identity_Server::init (int argc, CORBA::ORB_var orb = orb_manager_.orb (); CORBA::Object_var obj = orb->string_to_object (this->group_factory_ior_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Load_Balancer::Object_Group_Factory_var factory = Load_Balancer::Object_Group_Factory::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (factory.in ())) @@ -108,7 +108,7 @@ Identity_Server::init (int argc, Load_Balancer::Object_Group_var random_group = factory->make_random ("Identity, Random" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -117,7 +117,7 @@ Identity_Server::init (int argc, Load_Balancer::Object_Group_var rr_group = factory->make_round_robin ("Identity, Round Robin" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create the requested number of <Identity> objects, and @@ -130,7 +130,7 @@ Identity_Server::init (int argc, random_objects_)); create_objects (random_objects_, random_group.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -139,7 +139,7 @@ Identity_Server::init (int argc, random_objects_)); create_objects (rr_objects_, rr_group.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -156,7 +156,7 @@ Identity_Server::init (int argc, void Identity_Server::create_objects (size_t number_of_objects, Load_Balancer::Object_Group_ptr group - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Create the specified number of servants, and register each one // with the provided <Object_Group>. @@ -176,29 +176,29 @@ Identity_Server::create_objects (size_t number_of_objects, ACE_CHECK; PortableServer::ServantBase_var s = identity_servant; orb_manager_.activate (identity_servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; Load_Balancer::Member member; member.id = CORBA::string_dup (id); - member.obj = identity_servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + member.obj = identity_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Bind the servant in the <Object_Group>. - group->bind (member TAO_ENV_ARG_PARAMETER); + group->bind (member ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } int -Identity_Server::run (TAO_ENV_SINGLE_ARG_DECL) +Identity_Server::run (ACE_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "Identity_Server: Initialized \n")); int result; - result = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER); + result = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return result; @@ -217,10 +217,10 @@ main (int argc, char *argv[]) if (server.init (argc, argv) == -1) return 1; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - result = server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + result = server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Load_Balancing/Identity_Server.h b/TAO/examples/Load_Balancing/Identity_Server.h index 698d5c89806..5b9249f8fac 100644 --- a/TAO/examples/Load_Balancing/Identity_Server.h +++ b/TAO/examples/Load_Balancing/Identity_Server.h @@ -49,7 +49,7 @@ public: // Performs all the initializations necessary before going into the // ORB event loop. - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the server. private: @@ -58,7 +58,7 @@ private: void create_objects (size_t number_of_objects, Load_Balancer::Object_Group_ptr group - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Creates the specified number of identity objects, and registers // each one with the provided <Object_Group>. Identity servants are // given names diff --git a/TAO/examples/Load_Balancing/Identity_i.cpp b/TAO/examples/Load_Balancing/Identity_i.cpp index ff364494541..69a168f2e63 100644 --- a/TAO/examples/Load_Balancing/Identity_i.cpp +++ b/TAO/examples/Load_Balancing/Identity_i.cpp @@ -25,7 +25,7 @@ Identity_i::~Identity_i (void) void Identity_i::get_name (CORBA::String_out name - TAO_ENV_ARG_DECL_NOT_USED ) + ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { name = this->name_.in (); diff --git a/TAO/examples/Load_Balancing/Identity_i.h b/TAO/examples/Load_Balancing/Identity_i.h index 281ca40f138..568f798f1b5 100644 --- a/TAO/examples/Load_Balancing/Identity_i.h +++ b/TAO/examples/Load_Balancing/Identity_i.h @@ -37,7 +37,7 @@ public: // Destructor. virtual void get_name (CORBA::String_out name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns the name of this object. diff --git a/TAO/examples/Load_Balancing/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing/Load_Balancer_i.cpp index 9bc3e9a90ba..78537a45bd4 100644 --- a/TAO/examples/Load_Balancing/Load_Balancer_i.cpp +++ b/TAO/examples/Load_Balancing/Load_Balancer_i.cpp @@ -33,30 +33,30 @@ Object_Group_Factory_i::remove_group (const ACE_CString &id, Load_Balancer::Object_Group_ptr Object_Group_Factory_i::make_round_robin (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)) { return make_group (0, id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } Load_Balancer::Object_Group_ptr Object_Group_Factory_i::make_random (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)) { return make_group (1, id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } Load_Balancer::Object_Group_ptr Object_Group_Factory_i::make_group (int random, const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)) { @@ -89,10 +89,10 @@ Object_Group_Factory_i::make_group (int random, ACE_Auto_Basic_Ptr<Object_Group_i> temp (group_servant); // Register with the poa, begin using ref. counting. - group = group_servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + group = group_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (group._retn ()); - group_servant->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + group_servant->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (Load_Balancer::Object_Group::_nil ()); temp.release (); @@ -123,7 +123,7 @@ Object_Group_Factory_i::make_group (int random, Load_Balancer::Object_Group_ptr Object_Group_Factory_i::resolve (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_group)) { @@ -140,7 +140,7 @@ Object_Group_Factory_i::resolve (const char * id Load_Balancer::Group_List * Object_Group_Factory_i::list_groups (int random - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { Load_Balancer::Group_List * list; @@ -181,17 +181,17 @@ Object_Group_Factory_i::list_groups (int random } Load_Balancer::Group_List * -Object_Group_Factory_i::round_robin_groups (TAO_ENV_SINGLE_ARG_DECL) +Object_Group_Factory_i::round_robin_groups (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return list_groups (0 TAO_ENV_ARG_PARAMETER); + return list_groups (0 ACE_ENV_ARG_PARAMETER); } Load_Balancer::Group_List * -Object_Group_Factory_i::random_groups (TAO_ENV_SINGLE_ARG_DECL) +Object_Group_Factory_i::random_groups (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return list_groups (1 TAO_ENV_ARG_PARAMETER); + return list_groups (1 ACE_ENV_ARG_PARAMETER); } Object_Group_i::Object_Group_i (const char * id, @@ -214,7 +214,7 @@ Object_Group_i::~Object_Group_i (void) } char * -Object_Group_i::id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Object_Group_i::id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (id_.c_str ()); @@ -222,7 +222,7 @@ Object_Group_i::id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void Object_Group_i::bind (const Load_Balancer::Member & member - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_member)) { @@ -257,7 +257,7 @@ Object_Group_i::bind (const Load_Balancer::Member & member void Object_Group_i::unbind (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)) { @@ -287,7 +287,7 @@ Object_Group_i::unbind (const char * id CORBA::Object_ptr Object_Group_i::resolve_with_id (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)) { @@ -302,7 +302,7 @@ Object_Group_i::resolve_with_id (const char * id } Load_Balancer::Member_ID_List * -Object_Group_i::members (TAO_ENV_SINGLE_ARG_DECL) +Object_Group_i::members (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { Load_Balancer::Member_ID_List * list; @@ -331,21 +331,21 @@ Object_Group_i::members (TAO_ENV_SINGLE_ARG_DECL) } void -Object_Group_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +Object_Group_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Deregister with POA. PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; poa->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -366,18 +366,18 @@ Random_Object_Group::~Random_Object_Group (void) } void -Random_Object_Group::destroy (TAO_ENV_SINGLE_ARG_DECL) +Random_Object_Group::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { //Deregisters this <Object_Group> with its // <Object_Group_Factory>. my_factory_->remove_group (id_, 1); - Object_Group_i::destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + Object_Group_i::destroy (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::Object_ptr -Random_Object_Group::resolve (TAO_ENV_SINGLE_ARG_DECL) +Random_Object_Group::resolve (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)) { @@ -416,18 +416,18 @@ RR_Object_Group::~RR_Object_Group (void) } void -RR_Object_Group::destroy (TAO_ENV_SINGLE_ARG_DECL) +RR_Object_Group::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { //Deregisters this <Object_Group> with its // <Object_Group_Factory>. my_factory_->remove_group (id_, 0); - Object_Group_i::destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + Object_Group_i::destroy (ACE_ENV_SINGLE_ARG_PARAMETER); } CORBA::Object_ptr -RR_Object_Group::resolve (TAO_ENV_SINGLE_ARG_DECL) +RR_Object_Group::resolve (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)) { @@ -459,7 +459,7 @@ RR_Object_Group::resolve (TAO_ENV_SINGLE_ARG_DECL) void RR_Object_Group::unbind (const char *id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)) { diff --git a/TAO/examples/Load_Balancing/Load_Balancer_i.h b/TAO/examples/Load_Balancing/Load_Balancer_i.h index cf997db1d6c..55a649c273e 100644 --- a/TAO/examples/Load_Balancing/Load_Balancer_i.h +++ b/TAO/examples/Load_Balancing/Load_Balancer_i.h @@ -59,7 +59,7 @@ public: // = Load_Balancer::Object_Group_Factory idl methods. Load_Balancer::Object_Group_ptr make_round_robin (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)); // Creates an <Object_Group> that resolves requests for arbitrary @@ -69,7 +69,7 @@ public: // exception is thrown. Load_Balancer::Object_Group_ptr make_random (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)); // Creates an <Object_Group> that resolves requests for arbitrary @@ -79,21 +79,21 @@ public: // exception is thrown. Load_Balancer::Object_Group_ptr resolve (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_group)); // Locates and returns an <Object_Group> by its <Group_ID>. If // no <Object_Group> has <Group_ID> of <id>, throw a // <no_such_group> exception. - Load_Balancer::Group_List * round_robin_groups (TAO_ENV_SINGLE_ARG_DECL) + Load_Balancer::Group_List * round_robin_groups (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Lists all the round robin <Object_Group>s which were created // by this factory, and haven't been destroyed yet, i.e., return // a sequence of <Group_ID>s of all existing round robin // <Object_Group>s created by this factory. - Load_Balancer::Group_List * random_groups (TAO_ENV_SINGLE_ARG_DECL) + Load_Balancer::Group_List * random_groups (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Lists all the random <Object_Group>s which were created // by this factory, and haven't been destroyed yet, i.e., return @@ -116,7 +116,7 @@ private: Load_Balancer::Object_Group_ptr make_group (int random, const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)); // This function factors out common code in <make_round_robin> and @@ -124,7 +124,7 @@ private: // set to 1 and round robin <Object_Group> if it is 0. Load_Balancer::Group_List * list_groups (int random - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // This function factors out common code in <random_groups> and // <round_robin_groups>. Returns a sequence of its random // groups if <random> parameter is set to 1 and a sequence of its @@ -170,12 +170,12 @@ public: // = Load_Balancer::Object_Group idl methods. - char * id (TAO_ENV_SINGLE_ARG_DECL) + char * id (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Get group's id. void bind (const Load_Balancer::Member & member - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_member)); // Adds a new <member> to the <Object_Group>. Note that each @@ -184,14 +184,14 @@ public: // <duplicate_member> exceptions is thrown. void unbind (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)); // Removes a member with the specified <Member_ID> from the // <Object_Group>. If none of the group's members have a // Member_ID of <id>, <no_such_member> exception is thrown. - CORBA::Object_ptr resolve (TAO_ENV_SINGLE_ARG_DECL) + CORBA::Object_ptr resolve (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)) = 0; // Returns a member object from this <Object_Group> in accordance with @@ -200,18 +200,18 @@ public: // exception is thrown. CORBA::Object_ptr resolve_with_id (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)); // Returns an object with the specified <Member_ID>. If this // <Object_Group> contains no members with the specified // <Member_ID>, <no_such_member> exception is thrown. - Load_Balancer::Member_ID_List * members (TAO_ENV_SINGLE_ARG_DECL) + Load_Balancer::Member_ID_List * members (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Return a sequence of <Member_ID>s of all of its members. - void destroy (TAO_ENV_SINGLE_ARG_DECL) + void destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Cleanup the resources associated with this <Object_Group>. // Subsequent calls to this <Object_Group> should fail, and its @@ -265,13 +265,13 @@ public: ~Random_Object_Group (void); // Destructor. - CORBA::Object_ptr resolve (TAO_ENV_SINGLE_ARG_DECL) + CORBA::Object_ptr resolve (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)); // Returns a member object from this <Object_Group> in accordance with // the "random" load balancing policy. - void destroy (TAO_ENV_SINGLE_ARG_DECL) + void destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Cleanup the resources associated with this <Object_Group>. // Subsequent calls to this <Object_Group> should fail, and its @@ -295,20 +295,20 @@ public: // Destructor. void unbind (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)); // We need to override the implementation of <unbind> from // Object_Group_i to make sure <resolve> // works correctly. - CORBA::Object_ptr resolve (TAO_ENV_SINGLE_ARG_DECL) + CORBA::Object_ptr resolve (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)); // Returns a member object from this <Object_Group> in accordance with // the "round robin" load balancing policy. - void destroy (TAO_ENV_SINGLE_ARG_DECL) + void destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Cleanup the resources associated with this <Object_Group>. // Subsequent calls to this <Object_Group> should fail, and its diff --git a/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp b/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp index 9011b0d388d..fc4df170ef7 100644 --- a/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp +++ b/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp @@ -65,12 +65,12 @@ Load_Balancing_Service::init (int argc, int result; CORBA::String_var ior; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { result = this->orb_manager_.init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) return result; @@ -87,7 +87,7 @@ Load_Balancing_Service::init (int argc, -1); PortableServer::ServantBase_var s = factory_servant; ior = orb_manager_.activate (factory_servant - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (ior.in () == 0) @@ -118,14 +118,14 @@ Load_Balancing_Service::init (int argc, int -Load_Balancing_Service::run (TAO_ENV_SINGLE_ARG_DECL) +Load_Balancing_Service::run (ACE_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "Load_Balancer: Initialized \n")); int result; - result = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER); + result = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return result; @@ -144,10 +144,10 @@ main (int argc, char *argv[]) if (factory.init (argc, argv) == -1) return 1; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - result = factory.run (TAO_ENV_SINGLE_ARG_PARAMETER); + result = factory.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Load_Balancing/Load_Balancing_Service.h b/TAO/examples/Load_Balancing/Load_Balancing_Service.h index c9aea348aa8..eb42bb8375a 100644 --- a/TAO/examples/Load_Balancing/Load_Balancing_Service.h +++ b/TAO/examples/Load_Balancing/Load_Balancing_Service.h @@ -44,7 +44,7 @@ public: // Initialize the <Load_Balancing_Service>: initializes the ORB, parses // arguments, creates a servant ... - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the server. private: diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp index 5f58ee660d2..d8843235965 100755 --- a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp +++ b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp @@ -82,7 +82,7 @@ Identity_Client::init (int argc, { result = this->orb_manager_.init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) return result; @@ -104,13 +104,13 @@ Identity_Client::init (int argc, } int -Identity_Client::run (TAO_ENV_SINGLE_ARG_DECL) +Identity_Client::run (ACE_ENV_SINGLE_ARG_DECL) { // Contact the <Object_Group_Factory> to obtain an <Object_Group>. CORBA::ORB_var orb = orb_manager_.orb (); CORBA::Object_var obj = orb->string_to_object (this->group_factory_ior_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (obj.in () == 0) @@ -121,7 +121,7 @@ Identity_Client::run (TAO_ENV_SINGLE_ARG_DECL) Load_Balancer::Object_Group_Factory_var factory = Load_Balancer::Object_Group_Factory::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (CORBA::is_nil (factory.in ())) @@ -157,7 +157,7 @@ Identity_Client::run (TAO_ENV_SINGLE_ARG_DECL) // Remote call object_group = factory->resolve (group_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::String_var iorstring = @@ -187,13 +187,13 @@ Identity_Client::run (TAO_ENV_SINGLE_ARG_DECL) } // List <Object_Group>'s id. - CORBA::String_var id = object_group->id (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var id = object_group->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, "Object Group's id is: %s\n\n", id.in ())); // List all <Object_Group>s members. Load_Balancer::Member_ID_List_var id_list = - object_group->members (TAO_ENV_SINGLE_ARG_PARAMETER); + object_group->members (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_DEBUG ((LM_DEBUG, "The group contains %d members:\n", @@ -211,15 +211,15 @@ Identity_Client::run (TAO_ENV_SINGLE_ARG_DECL) for (size_t ind = 0; ind < this->number_of_invocations_; ++ind) { - objref = object_group->resolve (TAO_ENV_SINGLE_ARG_PARAMETER); + objref = object_group->resolve (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); obj = orb->string_to_object (objref.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); identity_object = Identity::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (CORBA::is_nil (identity_object.in ())) @@ -256,7 +256,7 @@ main (int argc, char *argv[]) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - result = client.run (TAO_ENV_SINGLE_ARG_PARAMETER); + result = client.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Client.h b/TAO/examples/Load_Balancing_persistent/Identity_Client.h index 64c168016e4..ceafcc5067f 100755 --- a/TAO/examples/Load_Balancing_persistent/Identity_Client.h +++ b/TAO/examples/Load_Balancing_persistent/Identity_Client.h @@ -54,7 +54,7 @@ public: int init (int argc, char *argv[]); // Initializes <orb_manager_>, and parses commandline arguments. - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // See TITLE. private: diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp index 3857e58845d..5b2aa19c32a 100755 --- a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp +++ b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp @@ -62,7 +62,7 @@ Identity_Server::init (int argc, { result = this->orb_manager_.init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) return result; @@ -73,19 +73,19 @@ Identity_Server::init (int argc, // Lifespan policy policies[0] = this->orb_manager_.root_poa()->create_lifespan_policy (PortableServer::PERSISTENT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policies[1] = this->orb_manager_.root_poa()->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->persistent_POA_ = this->orb_manager_.root_poa()->create_POA ("persistent_server", this->orb_manager_.poa_manager (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -94,7 +94,7 @@ Identity_Server::init (int argc, i < policies.length (); ++i) { - policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -112,7 +112,7 @@ Identity_Server::init (int argc, } int -Identity_Server::register_groups (TAO_ENV_SINGLE_ARG_DECL) +Identity_Server::register_groups (ACE_ENV_SINGLE_ARG_DECL) { @@ -122,12 +122,12 @@ Identity_Server::register_groups (TAO_ENV_SINGLE_ARG_DECL) CORBA::ORB_var orb = orb_manager_.orb (); CORBA::Object_var obj = orb->string_to_object (this->group_factory_ior_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); Load_Balancer::Object_Group_Factory_var factory = Load_Balancer::Object_Group_Factory::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (CORBA::is_nil (factory.in ())) @@ -141,7 +141,7 @@ Identity_Server::register_groups (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY_EX (UNBIND_RANDOM) { factory->unbind_random ("Random group" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (UNBIND_RANDOM); } ACE_CATCHANY @@ -155,7 +155,7 @@ Identity_Server::register_groups (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY_EX (UNBIND_ROUND) { factory->unbind_round_robin ("Round Robin group" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (UNBIND_ROUND); } ACE_CATCHANY @@ -169,12 +169,12 @@ Identity_Server::register_groups (TAO_ENV_SINGLE_ARG_DECL) // We want to make two groups Random & Round Robin. Load_Balancer::Object_Group_var random_group = factory->make_random ("Random group" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); Load_Balancer::Object_Group_var rr_group = factory->make_round_robin ("Round Robin group" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); @@ -183,13 +183,13 @@ Identity_Server::register_groups (TAO_ENV_SINGLE_ARG_DECL) // <Object_Group>s. this->create_objects (random_objects_, random_group.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->create_objects (rr_objects_, rr_group.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -198,7 +198,7 @@ Identity_Server::register_groups (TAO_ENV_SINGLE_ARG_DECL) void Identity_Server::create_objects (size_t number_of_objects, Load_Balancer::Object_Group_ptr group - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Create the specified number of servants, and register each one // with the provided <Object_Group>. @@ -218,23 +218,23 @@ Identity_Server::create_objects (size_t number_of_objects, ACE_CHECK; PortableServer::ServantBase_var s = identity_servant; - this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CORBA::Object_var obj = identity_servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Object_var obj = identity_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Load_Balancer::Member member; member.id = CORBA::string_dup (id); member.obj = this->orb_manager_.orb ()->object_to_string (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Do an unbind and then bind ACE_TRY_EX (UNBIND) { - group->unbind (id TAO_ENV_ARG_PARAMETER); + group->unbind (id ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (UNBIND); } ACE_CATCHANY @@ -245,18 +245,18 @@ Identity_Server::create_objects (size_t number_of_objects, ACE_ENDTRY; // Bind the servant in the random <Object_Group>. - group->bind (member TAO_ENV_ARG_PARAMETER); + group->bind (member ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } int - Identity_Server::run (TAO_ENV_SINGLE_ARG_DECL) + Identity_Server::run (ACE_ENV_SINGLE_ARG_DECL) { int result; - result = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER); + result = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return result; @@ -282,10 +282,10 @@ main (int argc, char *argv[]) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - result = server.register_groups (TAO_ENV_SINGLE_ARG_PARAMETER); + result = server.register_groups (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - result = server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + result = server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Server.h b/TAO/examples/Load_Balancing_persistent/Identity_Server.h index 7ee31f5fd29..d9f69946a5d 100755 --- a/TAO/examples/Load_Balancing_persistent/Identity_Server.h +++ b/TAO/examples/Load_Balancing_persistent/Identity_Server.h @@ -52,10 +52,10 @@ public: // Performs all the initializations necessary before going into the // ORB event loop. - int register_groups (TAO_ENV_SINGLE_ARG_DECL); + int register_groups (ACE_ENV_SINGLE_ARG_DECL); - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the server. private: @@ -63,7 +63,7 @@ private: void create_objects (size_t number_of_objects, Load_Balancer::Object_Group_ptr group - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Creates the specified number of identity objects, and registers // each one with the provided <Object_Group>. Identity servants are // given names diff --git a/TAO/examples/Load_Balancing_persistent/Identity_i.cpp b/TAO/examples/Load_Balancing_persistent/Identity_i.cpp index 16ac105669f..5c8d6b0b57d 100755 --- a/TAO/examples/Load_Balancing_persistent/Identity_i.cpp +++ b/TAO/examples/Load_Balancing_persistent/Identity_i.cpp @@ -27,14 +27,14 @@ Identity_i::~Identity_i (void) void Identity_i::get_name (CORBA::String_out name - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { name = this->name_.in (); } PortableServer::POA_ptr -Identity_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Identity_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POA::_duplicate (this->poa_.in ()); diff --git a/TAO/examples/Load_Balancing_persistent/Identity_i.h b/TAO/examples/Load_Balancing_persistent/Identity_i.h index 0e381b99b4c..1a7df37cfbc 100755 --- a/TAO/examples/Load_Balancing_persistent/Identity_i.h +++ b/TAO/examples/Load_Balancing_persistent/Identity_i.h @@ -38,11 +38,11 @@ public: // Destructor. virtual void get_name (CORBA::String_out name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns the name of this object. - PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL) + PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Method for the POA that will return the persistent POA_ptr stored // in here.. diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp index 8448a84b8c6..30bb0dd6831 100755 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp @@ -39,7 +39,7 @@ Object_Group_Factory_i::~Object_Group_Factory_i (void) } PortableServer::POA_ptr -Object_Group_Factory_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Object_Group_Factory_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POA::_duplicate (this->poa_.in ()); @@ -48,7 +48,7 @@ Object_Group_Factory_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) Load_Balancer::Object_Group_ptr Object_Group_Factory_i::make_round_robin (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)) { @@ -74,12 +74,12 @@ Object_Group_Factory_i::make_round_robin (const char * id return this->make_group (0, id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void Object_Group_Factory_i::unbind_round_robin (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_group)) { @@ -120,7 +120,7 @@ Object_Group_Factory_i::unbind_round_robin (const char * id Load_Balancer::Object_Group_ptr Object_Group_Factory_i::make_random (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)) { @@ -146,13 +146,13 @@ Object_Group_Factory_i::make_random (const char * id return this->make_group (1, id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void Object_Group_Factory_i::unbind_random (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_group)) { @@ -193,7 +193,7 @@ Object_Group_Factory_i::unbind_random (const char * id Load_Balancer::Object_Group_ptr Object_Group_Factory_i::make_group (int random, const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)) { @@ -237,15 +237,15 @@ Object_Group_Factory_i::make_group (int random, ACE_CHECK_RETURN (group._retn ()); // Register with the poa, begin using ref. counting. - group = group_servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + group = group_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (group._retn ()); - group_servant->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + group_servant->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (Load_Balancer::Object_Group::_nil ()); CORBA::String_var ior = this->orb_->object_to_string (group.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Load_Balancer::Object_Group::_nil ()); @@ -287,7 +287,7 @@ Object_Group_Factory_i::make_group (int random, // Update the value of flags_ this->update_flags (random - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Load_Balancer::Object_Group::_nil ()); if (result == -1) @@ -309,7 +309,7 @@ Object_Group_Factory_i::make_group (int random, Load_Balancer::Object_Group_ptr Object_Group_Factory_i::resolve (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_group)) { @@ -358,7 +358,7 @@ Object_Group_Factory_i::resolve (const char * id { this->mem_pool_->find (flags_name_bind, (void *&)this->flags_); - this->update_objects (TAO_ENV_SINGLE_ARG_PARAMETER); + this->update_objects (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (Load_Balancer::Object_Group::_nil ()); } @@ -375,12 +375,12 @@ Object_Group_Factory_i::resolve (const char * id CORBA_Object_var objref = this->orb_->string_to_object (ior - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Load_Balancer::Object_Group::_nil ()); Load_Balancer::Object_Group_ptr object_group = Load_Balancer::Object_Group::_narrow (objref.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Load_Balancer::Object_Group::_nil ()); @@ -403,7 +403,7 @@ Object_Group_Factory_i::resolve (const char * id Load_Balancer::Group_List * Object_Group_Factory_i::list_groups (int random - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { Load_Balancer::Group_List * list; @@ -444,23 +444,23 @@ Object_Group_Factory_i::list_groups (int random } Load_Balancer::Group_List * -Object_Group_Factory_i::round_robin_groups (TAO_ENV_SINGLE_ARG_DECL) +Object_Group_Factory_i::round_robin_groups (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return list_groups (0 TAO_ENV_ARG_PARAMETER); + return list_groups (0 ACE_ENV_ARG_PARAMETER); } Load_Balancer::Group_List * -Object_Group_Factory_i::random_groups (TAO_ENV_SINGLE_ARG_DECL) +Object_Group_Factory_i::random_groups (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return list_groups (1 TAO_ENV_ARG_PARAMETER); + return list_groups (1 ACE_ENV_ARG_PARAMETER); } void Object_Group_Factory_i::update_flags (int random - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { //First check whether we have memory for flags_ if (!this->flags_) @@ -503,7 +503,7 @@ Object_Group_Factory_i::update_flags (int random } void -Object_Group_Factory_i::update_objects (TAO_ENV_SINGLE_ARG_DECL) +Object_Group_Factory_i::update_objects (ACE_ENV_SINGLE_ARG_DECL) { // Create an appropriate servant. Object_Group_i * group_servant = 0; @@ -583,7 +583,7 @@ Object_Group_i::~Object_Group_i (void) PortableServer::POA_ptr -Object_Group_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Object_Group_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POA::_duplicate (this->poa_.in ()); @@ -591,7 +591,7 @@ Object_Group_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) char * -Object_Group_i::id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Object_Group_i::id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (id_.c_str ()); @@ -599,14 +599,14 @@ Object_Group_i::id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void Object_Group_i::bind (const Load_Balancer::Member & member - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_member)) { if (this->members_ == 0) { - ACE_CString id = this->id (TAO_ENV_SINGLE_ARG_PARAMETER); + ACE_CString id = this->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; id += server_id_name_bind; @@ -665,7 +665,7 @@ Object_Group_i::bind (const Load_Balancer::Member & member // member's id into <member_id_list_>. ACE_CString id = dll_name_bind; - id += this->id (TAO_ENV_SINGLE_ARG_PARAMETER); + id += this->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; @@ -699,14 +699,14 @@ Object_Group_i::bind (const Load_Balancer::Member & member void Object_Group_i::unbind (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)) { // Check whether the this->member_ is NULL if (this->members_ == 0) { - ACE_CString id = this->id (TAO_ENV_SINGLE_ARG_PARAMETER); + ACE_CString id = this->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; id += server_id_name_bind; @@ -729,7 +729,7 @@ Object_Group_i::unbind (const char * id if (this->member_id_list_ == 0) { ACE_CString id = dll_name_bind; - id += this->id (TAO_ENV_SINGLE_ARG_PARAMETER); + id += this->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->allocator_->find (id.c_str (), @@ -753,7 +753,7 @@ Object_Group_i::unbind (const char * id char * Object_Group_i::resolve_with_id (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)) { @@ -773,12 +773,12 @@ Object_Group_i::resolve_with_id (const char * id } Load_Balancer::Member_ID_List * -Object_Group_i::members (TAO_ENV_SINGLE_ARG_DECL) +Object_Group_i::members (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { Load_Balancer::Member_ID_List * list = 0; - this->read_from_memory (TAO_ENV_SINGLE_ARG_PARAMETER); + this->read_from_memory (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Figure out the length of the list. @@ -807,29 +807,29 @@ Object_Group_i::members (TAO_ENV_SINGLE_ARG_DECL) } void -Object_Group_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +Object_Group_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Deregister with POA. PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; poa->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -Object_Group_i::read_from_memory (TAO_ENV_SINGLE_ARG_DECL) +Object_Group_i::read_from_memory (ACE_ENV_SINGLE_ARG_DECL) { // Sanity check needs to be done in all the places - ACE_CString id = this->id (TAO_ENV_SINGLE_ARG_PARAMETER); + ACE_CString id = this->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (!this->members_) @@ -848,7 +848,7 @@ Object_Group_i::read_from_memory (TAO_ENV_SINGLE_ARG_DECL) if (!this->member_id_list_) { id = dll_name_bind; - id += this->id (TAO_ENV_SINGLE_ARG_PARAMETER); + id += this->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->allocator_->find (id.c_str (), @@ -871,12 +871,12 @@ Random_Object_Group::Random_Object_Group (const char *id, } char * -Random_Object_Group::resolve (TAO_ENV_SINGLE_ARG_DECL) +Random_Object_Group::resolve (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)) { - this->read_from_memory (TAO_ENV_SINGLE_ARG_PARAMETER); + this->read_from_memory (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); size_t group_size = this->members_->current_size (); @@ -911,13 +911,13 @@ RR_Object_Group::RR_Object_Group (const char *id, } char * -RR_Object_Group::resolve (TAO_ENV_SINGLE_ARG_DECL) +RR_Object_Group::resolve (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)) { char *objref = 0; - this->read_from_memory (TAO_ENV_SINGLE_ARG_PARAMETER); + this->read_from_memory (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); size_t group_size = this->members_->current_size (); @@ -949,14 +949,14 @@ RR_Object_Group::resolve (TAO_ENV_SINGLE_ARG_DECL) void RR_Object_Group::unbind (const char *id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)) { if (this->members_ == 0) { - ACE_CString id = this->id (TAO_ENV_SINGLE_ARG_PARAMETER); + ACE_CString id = this->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; id += server_id_name_bind; @@ -982,7 +982,7 @@ RR_Object_Group::unbind (const char *id if (this->member_id_list_ == 0) { ACE_CString id = dll_name_bind; - id += this->id (TAO_ENV_SINGLE_ARG_PARAMETER); + id += this->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->allocator_->find (id.c_str (), diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h index 5bc65fba26d..7eff01186b3 100755 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h @@ -66,7 +66,7 @@ public: // Destructor. - PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL) + PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Method for the POA that will return the persistent POA_ptr stored // in here.. @@ -74,7 +74,7 @@ public: // = Load_Balancer::Object_Group_Factory idl methods. Load_Balancer::Object_Group_ptr make_round_robin (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)); // Creates an <Object_Group> that resolves requests for arbitrary @@ -84,13 +84,13 @@ public: // exception is thrown. void unbind_round_robin (const char *id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_group)); Load_Balancer::Object_Group_ptr make_random (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)); // Creates an <Object_Group> that resolves requests for arbitrary @@ -100,26 +100,26 @@ public: // exception is thrown. void unbind_random (const char *id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_group)); Load_Balancer::Object_Group_ptr resolve (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_group)); // Locates and returns an <Object_Group IOR> by its <Group_ID>. If // no <Object_Group> has <Group_ID> of <id>, throw a // <no_such_group> exception. - Load_Balancer::Group_List * round_robin_groups (TAO_ENV_SINGLE_ARG_DECL) + Load_Balancer::Group_List * round_robin_groups (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Lists all the round robin <Object_Group>s which were created // by this factory, and haven't been destroyed yet, i.e., return // a sequence of <Group_ID>s of all existing round robin // <Object_Group>s created by this factory. - Load_Balancer::Group_List * random_groups (TAO_ENV_SINGLE_ARG_DECL) + Load_Balancer::Group_List * random_groups (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Lists all the random <Object_Group>s which were created // by this factory, and haven't been destroyed yet, i.e., return @@ -138,7 +138,7 @@ private: Load_Balancer::Object_Group_ptr make_group (int random, const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)); // This function factors out common code in <make_round_robin> and @@ -146,17 +146,17 @@ private: // set to 1 and round robin <Object_Group> if it is 0. Load_Balancer::Group_List * list_groups (int random - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // This function factors out common code in <random_groups> and // <round_robin_groups>. Returns a sequence of its random // groups if <random> parameter is set to 1 and a sequence of its // round robin groups if it is 0. void update_flags (int random - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // The helper that updates the vlaue of the variable flags_ - void update_objects (TAO_ENV_SINGLE_ARG_DECL); + void update_objects (ACE_ENV_SINGLE_ARG_DECL); // This rolls back the status of the objects in the POA if the // service had failed.. @@ -211,17 +211,17 @@ public: // Persistent POA // Method for the POA - PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL) + PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // = Load_Balancer::Object_Group idl methods. - char * id (TAO_ENV_SINGLE_ARG_DECL) + char * id (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Get group's id. void bind (const Load_Balancer::Member & member - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_member)); // Adds a new <member> to the <Object_Group>. Note that each @@ -230,14 +230,14 @@ public: // <duplicate_member> exceptions is thrown. void unbind (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)); // Removes a member with the specified <Member_ID> from the // <Object_Group>. If none of the group's members have a // Member_ID of <id>, <no_such_member> exception is thrown. - char * resolve (TAO_ENV_SINGLE_ARG_DECL) + char * resolve (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)) = 0; // Returns a member object from this <Object_Group> in accordance with @@ -246,18 +246,18 @@ public: // exception is thrown. char * resolve_with_id (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)); // Returns an object with the specified <Member_ID>. If this // <Object_Group> contains no members with the specified // <Member_ID>, <no_such_member> exception is thrown. - Load_Balancer::Member_ID_List * members (TAO_ENV_SINGLE_ARG_DECL) + Load_Balancer::Member_ID_List * members (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Return a sequence of <Member_ID>s of all of its members. - void destroy (TAO_ENV_SINGLE_ARG_DECL) + void destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Cleanup the resources associated with this <Object_Group>. // Subsequent calls to this <Object_Group> should fail, and its @@ -266,7 +266,7 @@ public: protected: - void read_from_memory (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + void read_from_memory (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); // This will replenish all the pointers that could have been lost // because of failure @@ -309,7 +309,7 @@ public: PortableServer::POA_ptr poa); // Constructor. - char * resolve (TAO_ENV_SINGLE_ARG_DECL) + char * resolve (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)); // Returns a member object from this <Object_Group> in accordance with @@ -330,14 +330,14 @@ public: // Constructor. void unbind (const char * id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)); // We need to override the implementation of <unbind> from // Object_Group_i to make sure <resolve> // works correctly. - char * resolve (TAO_ENV_SINGLE_ARG_DECL) + char * resolve (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)); // Returns a member object from this <Object_Group> in accordance with diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp index 57b7d0ba7a9..bfe1cee4852 100755 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp @@ -70,7 +70,7 @@ Load_Balancing_Service::init (int argc, { result = this->orb_manager_.init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) return result; @@ -87,19 +87,19 @@ Load_Balancing_Service::init (int argc, // Lifespan policy policies[0] = this->orb_manager_.root_poa()->create_lifespan_policy (PortableServer::PERSISTENT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policies[1] = this->orb_manager_.root_poa()->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var persistent_POA = this->orb_manager_.root_poa()->create_POA ("persistent", this->orb_manager_.poa_manager (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -108,7 +108,7 @@ Load_Balancing_Service::init (int argc, i < policies.length (); ++i) { - policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -121,13 +121,13 @@ Load_Balancing_Service::init (int argc, // Activate the POA manager //PortableServer::ServantBase_var s = factory_servant; - 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; CORBA::Object_var objref = factory_servant->_this (); ior = this->orb_manager_.orb ()->object_to_string (objref.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (ior.in () == 0) @@ -158,11 +158,11 @@ Load_Balancing_Service::init (int argc, int -Load_Balancing_Service::run (TAO_ENV_SINGLE_ARG_DECL) +Load_Balancing_Service::run (ACE_ENV_SINGLE_ARG_DECL) { int result; - result = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER); + result = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return result; @@ -184,7 +184,7 @@ main (int argc, char *argv[]) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - result = factory.run (TAO_ENV_SINGLE_ARG_PARAMETER); + result = factory.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h index cf39008b21d..e25661d9bd5 100755 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h @@ -44,7 +44,7 @@ public: // Initialize the <Load_Balancing_Service>: initializes the ORB, parses // arguments, creates a servant ... - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the server. private: diff --git a/TAO/examples/Logging/Logger_i.cpp b/TAO/examples/Logging/Logger_i.cpp index 6a1cf278034..da8d25ba2d0 100644 --- a/TAO/examples/Logging/Logger_i.cpp +++ b/TAO/examples/Logging/Logger_i.cpp @@ -19,7 +19,7 @@ Logger_Factory_i::~Logger_Factory_i (void) Logger_ptr Logger_Factory_i::make_logger (const char *name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { Logger_i *result; @@ -62,7 +62,7 @@ Logger_Factory_i::make_logger (const char *name // registration attempt. // @@ Matt, this code doesn't seem right. Can you please check with // Irfan and Carlos about whether this is the right thing to do? - return result->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + return result->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } Logger_i::Logger_i (const char *name) @@ -112,33 +112,33 @@ Logger_i::verbosity_conversion (Logger::Verbosity_Level verbosity_level) void Logger_i::log (const Logger::Log_Record &log_rec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->logv (log_rec, verbosity_level_ TAO_ENV_ARG_PARAMETER); + this->logv (log_rec, verbosity_level_ ACE_ENV_ARG_PARAMETER); } void Logger_i::log2 (const Logger::Log_Record &log_rec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->logv (log_rec, verbosity_level_ TAO_ENV_ARG_PARAMETER); + this->logv (log_rec, verbosity_level_ ACE_ENV_ARG_PARAMETER); } void Logger_i::logv2 (const Logger::Log_Record &log_rec, Logger::Verbosity_Level verbosity - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->logv (log_rec, verbosity TAO_ENV_ARG_PARAMETER); + this->logv (log_rec, verbosity ACE_ENV_ARG_PARAMETER); } void Logger_i::logv (const Logger::Log_Record &log_rec, Logger::Verbosity_Level verbosity - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // Create an <ACE_Log_Record> to leverage existing logging @@ -188,7 +188,7 @@ Logger_i::logv (const Logger::Log_Record &log_rec, void Logger_i::verbosity (Logger::Verbosity_Level level - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->verbosity_level_ = level; diff --git a/TAO/examples/Logging/Logger_i.h b/TAO/examples/Logging/Logger_i.h index c775c094e55..a24b2565250 100644 --- a/TAO/examples/Logging/Logger_i.h +++ b/TAO/examples/Logging/Logger_i.h @@ -35,31 +35,31 @@ public: // destructor virtual void log (const Logger::Log_Record &log_rec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Writes the <log_rec> to the standard output. virtual void logv (const Logger::Log_Record &log_rec, Logger::Verbosity_Level verbosity - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Writes the <log_rec> to the standard output with the given // verbosity level virtual void log2 (const Logger::Log_Record &log_rec - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Writes the <log_rec> to the standard output. virtual void logv2 (const Logger::Log_Record &log_rec, Logger::Verbosity_Level verbosity - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Writes the <log_rec> to the standard output with the given // verbosity level void verbosity (Logger::Verbosity_Level level - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Sets the verbosity level. Valid values are {VERBOSE, VERBOSE_LITE // and SILENT}. Defaults to VERBOSE @@ -94,7 +94,7 @@ public: // Destructor. virtual Logger_ptr make_logger (const char *name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // This function returns a logger with name <name>. If <name> is // unique, a new logger is created; else, a previously created diff --git a/TAO/examples/Logging/Logging_Service.cpp b/TAO/examples/Logging/Logging_Service.cpp index d8943451bf2..51f5062e56e 100644 --- a/TAO/examples/Logging/Logging_Service.cpp +++ b/TAO/examples/Logging/Logging_Service.cpp @@ -14,16 +14,16 @@ main (int argc, char *argv[]) Logger_Server log_server; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - int ret = log_server.init (argc, argv TAO_ENV_ARG_PARAMETER); + int ret = log_server.init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (ret == -1) return 1; else { - log_server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + log_server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/examples/Logging/Logging_Service_i.cpp b/TAO/examples/Logging/Logging_Service_i.cpp index 75e64bb96c1..36a50a7287a 100644 --- a/TAO/examples/Logging/Logging_Service_i.cpp +++ b/TAO/examples/Logging/Logging_Service_i.cpp @@ -44,7 +44,7 @@ Logger_Server::parse_args (void) int Logger_Server::init (int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->argc_ = argc; this->argv_ = argv; @@ -54,7 +54,7 @@ Logger_Server::init (int argc, if (this->orb_manager_.init_child_poa (argc, argv, "child_poa" - TAO_ENV_ARG_PARAMETER) == -1) + ACE_ENV_ARG_PARAMETER) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "init_child_poa"), @@ -62,7 +62,7 @@ Logger_Server::init (int argc, ACE_CHECK_RETURN (-1); - this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Parse the command line arguments. @@ -76,14 +76,14 @@ Logger_Server::init (int argc, CORBA::String_var str = this->orb_manager_.activate_under_child_poa ("logger_factory", &this->factory_impl_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "The IOR is: <%s>\n", str.in ())); // Initialize the naming service - int ret = this->init_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER); + int ret = this->init_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (ret != 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -99,7 +99,7 @@ Logger_Server::init (int argc, // and logger_factory object. int -Logger_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL_NOT_USED TAO_ENV_SINGLE_ARG_PARAMETER) +Logger_Server::init_naming_service (ACE_ENV_SINGLE_ARG_DECL_NOT_USED ACE_ENV_SINGLE_ARG_PARAMETER) { // Get pointers to the ORB and child POA CORBA::ORB_var orb = this->orb_manager_.orb (); @@ -111,7 +111,7 @@ Logger_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL_NOT_USED TAO_ENV_SIN return -1; // Create an instance of the Logger_Factory - Logger_Factory_var factory = this->factory_impl_._this (TAO_ENV_SINGLE_ARG_PARAMETER); + Logger_Factory_var factory = this->factory_impl_._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); //Register the logger_factory @@ -120,16 +120,16 @@ Logger_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL_NOT_USED TAO_ENV_SIN factory_name[0].id = CORBA::string_dup ("Logger_Factory"); this->my_name_server_->bind (factory_name, factory.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; } int -Logger_Server::run (TAO_ENV_SINGLE_ARG_DECL) +Logger_Server::run (ACE_ENV_SINGLE_ARG_DECL) { - int ret = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER); + int ret = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (ret == -1) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/examples/Logging/Logging_Service_i.h b/TAO/examples/Logging/Logging_Service_i.h index 0f94019e7b2..bc70c520427 100644 --- a/TAO/examples/Logging/Logging_Service_i.h +++ b/TAO/examples/Logging/Logging_Service_i.h @@ -58,14 +58,14 @@ public: int init (int argc, char **argv - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize the Logger_Server state - parsing arguments and ... - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the ORB. Logger_ptr make_logger (const char *name - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // This function creates and returns a logger with the given <name>. // Currently, <name> is unused. @@ -73,7 +73,7 @@ private: int parse_args (void); // Parses the commandline arguments. - int init_naming_service (TAO_ENV_SINGLE_ARG_DECL); + int init_naming_service (ACE_ENV_SINGLE_ARG_DECL); // Initialises the name server and registers logger_factory with the // name server. diff --git a/TAO/examples/Logging/Logging_Test_i.cpp b/TAO/examples/Logging/Logging_Test_i.cpp index 2941345f45d..8e47f94d2cf 100644 --- a/TAO/examples/Logging/Logging_Test_i.cpp +++ b/TAO/examples/Logging/Logging_Test_i.cpp @@ -28,7 +28,7 @@ Logger_Client::init (int argc, char *argv[]) this->argc_ = argc; this->argv_ = argv; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { if (TAO_debug_level > 0) @@ -38,7 +38,7 @@ Logger_Client::init (int argc, char *argv[]) orb_ = CORBA::ORB_init (argc, argv, "internet" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (TAO_debug_level > 0) @@ -50,7 +50,7 @@ Logger_Client::init (int argc, char *argv[]) return -1; // Initialize the naming service - int ret = this->init_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER); + int ret = this->init_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (ret != 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -58,7 +58,7 @@ Logger_Client::init (int argc, char *argv[]) "services.\n"), -1); // Create the logger instances - ret = this->init_loggers (TAO_ENV_SINGLE_ARG_PARAMETER); + ret = this->init_loggers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (ret != 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -79,7 +79,7 @@ Logger_Client::init (int argc, char *argv[]) } int -Logger_Client::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) +Logger_Client::init_naming_service (ACE_ENV_SINGLE_ARG_DECL) { // Initialize the naming services if (my_name_client_.init (orb_.in ()) != 0) @@ -95,7 +95,7 @@ Logger_Client::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) CORBA::Object_var factory_ref = my_name_client_->resolve (factory_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "\nFactory_ref resolved\n")); @@ -111,7 +111,7 @@ Logger_Client::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) // Narrow the factory and check the success factory_ = Logger_Factory::_narrow (factory_ref.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -127,7 +127,7 @@ Logger_Client::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) // If debugging, get the factory's IOR CORBA::String_var str = orb_->object_to_string (factory_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "The factory IOR is <%s>\n", @@ -136,18 +136,18 @@ Logger_Client::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) } int -Logger_Client::init_loggers (TAO_ENV_SINGLE_ARG_DECL) +Logger_Client::init_loggers (ACE_ENV_SINGLE_ARG_DECL) { // Retrieve the Logger obj ref corresponding to key1 and // key2. ACE_TRY { this->logger_1_ = factory_->make_logger ("key1" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->logger_2_ = factory_->make_logger ("key2" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (this->logger_1_.in ())) @@ -169,7 +169,7 @@ Logger_Client::init_loggers (TAO_ENV_SINGLE_ARG_DECL) ACE_DEBUG ((LM_DEBUG, "\nTrying to resolve already created logger...")); Logger_var logger_3 = factory_->make_logger ("key1" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (logger_3.in ())) @@ -195,7 +195,7 @@ Logger_Client::init_loggers (TAO_ENV_SINGLE_ARG_DECL) int Logger_Client::run (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Create 3 Log_Records for the test @@ -245,36 +245,36 @@ Logger_Client::run (void) } // Change the verbosity. - this->logger_1_->verbosity (Logger::VERBOSE_LITE TAO_ENV_ARG_PARAMETER); + this->logger_1_->verbosity (Logger::VERBOSE_LITE ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Log the first Log_Record (VERBOSE_LITE) - this->logger_1_->log (rec1 TAO_ENV_ARG_PARAMETER); + this->logger_1_->log (rec1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Change the verbosity again. - this->logger_2_->verbosity (Logger::VERBOSE TAO_ENV_ARG_PARAMETER); + this->logger_2_->verbosity (Logger::VERBOSE ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Log the second Log_Record (VERBOSE) - this->logger_2_->log (rec2 TAO_ENV_ARG_PARAMETER); + this->logger_2_->log (rec2 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Change the verbosity again - this->logger_2_->verbosity (Logger::SILENT TAO_ENV_ARG_PARAMETER); + this->logger_2_->verbosity (Logger::SILENT ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Log the third log record using logv() (this shows if the // verbosity level overrides the logger's verbosity level) - this->logger_2_->logv (rec3, Logger::VERBOSE TAO_ENV_ARG_PARAMETER); + this->logger_2_->logv (rec3, Logger::VERBOSE ACE_ENV_ARG_PARAMETER); // Change the verbosity again (so that regular log msgs can be // seen again) - this->logger_2_->verbosity (Logger::VERBOSE TAO_ENV_ARG_PARAMETER); + this->logger_2_->verbosity (Logger::VERBOSE ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Log the fourth record using log2() - this->logger_2_->log2 (rec4 TAO_ENV_ARG_PARAMETER); + this->logger_2_->log2 (rec4 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/examples/Logging/Logging_Test_i.h b/TAO/examples/Logging/Logging_Test_i.h index d377718d42f..4eee2679da6 100644 --- a/TAO/examples/Logging/Logging_Test_i.h +++ b/TAO/examples/Logging/Logging_Test_i.h @@ -69,10 +69,10 @@ private: const char *msg); // Prepares the <Log_Record> for logging. - int init_naming_service (TAO_ENV_SINGLE_ARG_DECL); + int init_naming_service (ACE_ENV_SINGLE_ARG_DECL); // Initialises the name server and resolves the logger_factory - int init_loggers (TAO_ENV_SINGLE_ARG_DECL); + int init_loggers (ACE_ENV_SINGLE_ARG_DECL); // Instantiates the 2 logger member variables void show_record (Logger::Log_Record &newrec); diff --git a/TAO/examples/OBV/Simple_util.cpp b/TAO/examples/OBV/Simple_util.cpp index 94ae6ef95ef..e8a85e4a6ef 100644 --- a/TAO/examples/OBV/Simple_util.cpp +++ b/TAO/examples/OBV/Simple_util.cpp @@ -66,14 +66,14 @@ template <class Servant> int Server<Servant>::init (const char *servant_name, int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Call the init of <TAO_ORB_Manager> to initialize the ORB and // create a child POA under the root POA. if (this->orb_manager_.init_child_poa (argc, argv, "child_poa" - TAO_ENV_ARG_PARAMETER) == -1) + ACE_ENV_ARG_PARAMETER) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "init_child_poa"), @@ -103,7 +103,7 @@ Server<Servant>::init (const char *servant_name, CORBA::String_var str = this->orb_manager_.activate_under_child_poa (servant_name, &this->servant_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -131,10 +131,10 @@ Server<Servant>::init (const char *servant_name, } template <class Servant>int -Server<Servant>::run (TAO_ENV_SINGLE_ARG_DECL) +Server<Servant>::run (ACE_ENV_SINGLE_ARG_DECL) { // Run the main event loop for the ORB. - 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, "Server_i::run"), -1); @@ -237,7 +237,7 @@ Client<InterfaceObj, Var>::init (const char *name, this->argv_ = argv; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -245,7 +245,7 @@ Client<InterfaceObj, Var>::init (const char *name, this->orb_ = CORBA::ORB_init (this->argc_, this->argv_, name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse command line and verify parameters. @@ -257,7 +257,7 @@ Client<InterfaceObj, Var>::init (const char *name, if(this->ior_ != 0) { CORBA::Object_var server_object = - this->orb_->string_to_object (this->ior_ TAO_ENV_ARG_PARAMETER); + this->orb_->string_to_object (this->ior_ ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -267,7 +267,7 @@ Client<InterfaceObj, Var>::init (const char *name, this->ior_), -1); this->server_ = InterfaceObj::_narrow (server_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else @@ -290,7 +290,7 @@ Client<InterfaceObj, Var>::init (const char *name, template <class InterfaceObj, class Var> int -Client<InterfaceObj, Var>::obtain_initial_references (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Client<InterfaceObj, Var>::obtain_initial_references (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return 0; diff --git a/TAO/examples/OBV/Simple_util.h b/TAO/examples/OBV/Simple_util.h index d5edffeeb05..fc8fb5eb7c6 100644 --- a/TAO/examples/OBV/Simple_util.h +++ b/TAO/examples/OBV/Simple_util.h @@ -52,7 +52,7 @@ public: int init (const char *servant_name, int argc, char *argv[] - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize the Server state - parsing arguments and waiting. // interface_name is the name used to register the Servant. @@ -60,7 +60,7 @@ public: // After calling <init>, this method will register the server with // the TAO Naming Service using the servant_name passed to <init>. - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the orb. protected: @@ -121,7 +121,7 @@ public: void shutdown (int); // Fills in the shutdwon flag. - int obtain_initial_references (TAO_ENV_SINGLE_ARG_DECL); + int obtain_initial_references (ACE_ENV_SINGLE_ARG_DECL); // Initialize naming service protected: diff --git a/TAO/examples/OBV/Typed_Events/Client_i.cpp b/TAO/examples/OBV/Typed_Events/Client_i.cpp index 6f93187e63c..c76cccb0176 100644 --- a/TAO/examples/OBV/Typed_Events/Client_i.cpp +++ b/TAO/examples/OBV/Typed_Events/Client_i.cpp @@ -18,7 +18,7 @@ Checkpoint_Client_i::run (const char *name, ACE_Time_Value now (ACE_OS::gettimeofday ()); ACE_OS::srand ((unsigned int) now.sec () ); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -41,14 +41,14 @@ Checkpoint_Client_i::run (const char *name, new Temperature_impl (temperature))); t_e->origin_id_ (KITCHEN); t_e->do_print (); - checkpoint->put_event (t_e TAO_ENV_ARG_PARAMETER); + checkpoint->put_event (t_e ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; temperature = random_number (25,30); t_e = new Temperature_impl (temperature); t_e->origin_id_ (BATHROOM); t_e->do_print (); - checkpoint->put_event (t_e TAO_ENV_ARG_PARAMETER); + checkpoint->put_event (t_e ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Point point = { random_number (0,4), @@ -58,7 +58,7 @@ Checkpoint_Client_i::run (const char *name, new Position_impl (point))); p_e->origin_id_ (JONAS); p_e->do_print (); - checkpoint->put_event (p_e TAO_ENV_ARG_PARAMETER); + checkpoint->put_event (p_e ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -69,13 +69,13 @@ Checkpoint_Client_i::run (const char *name, new Log_Msg_impl (urgent, a_text))); l_e->origin_id_ (JONAS); l_e->do_print (); - checkpoint->put_event (l_e TAO_ENV_ARG_PARAMETER); + checkpoint->put_event (l_e ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "\nNow getting the alarms:\n")); - Event_List_var list (checkpoint->get_critical_events (TAO_ENV_SINGLE_ARG_PARAMETER)); + Event_List_var list (checkpoint->get_critical_events (ACE_ENV_SINGLE_ARG_PARAMETER)); ACE_TRY_CHECK; for (Event_List_Iterator i (list); i.next (); i.advance ()) @@ -84,7 +84,7 @@ Checkpoint_Client_i::run (const char *name, } if (checkpoint.shutdown () == 1) - checkpoint->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + checkpoint->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp b/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp index 605c614f27d..ec5b27fb50b 100644 --- a/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp +++ b/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp @@ -18,7 +18,7 @@ Event_impl::~Event_impl () } void -Event_impl::do_print (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Event_impl::do_print (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { ACE_DEBUG((LM_DEBUG, "(time %d origin %d) ", (CORBA::ULong) this->time_(), @@ -54,10 +54,10 @@ Temperature_impl::~Temperature_impl () } void -Temperature_impl::do_print (TAO_ENV_SINGLE_ARG_DECL) +Temperature_impl::do_print (ACE_ENV_SINGLE_ARG_DECL) { // The timestamp - Event_impl::do_print (TAO_ENV_SINGLE_ARG_PARAMETER); + Event_impl::do_print (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG((LM_DEBUG, "Temperature is %f\n", this->temperature_() )); @@ -91,51 +91,51 @@ Position_impl::~Position_impl () } void -Position_impl::do_print (TAO_ENV_SINGLE_ARG_DECL) +Position_impl::do_print (ACE_ENV_SINGLE_ARG_DECL) { // The timestamp - Event_impl::do_print (TAO_ENV_SINGLE_ARG_PARAMETER); + Event_impl::do_print (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Float x = - this->x(TAO_ENV_SINGLE_ARG_PARAMETER); + this->x(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Float y = - this->y(TAO_ENV_SINGLE_ARG_PARAMETER); + this->y(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Float z = - this->z(TAO_ENV_SINGLE_ARG_PARAMETER); + this->z(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG((LM_DEBUG, "Position is (%f, %f, %f)\n", x, y, z)); } -CORBA::Float Position_impl::x (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +CORBA::Float Position_impl::x (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return this->xyz()[0]; } -void Position_impl::x (CORBA::Float x TAO_ENV_ARG_DECL_NOT_USED) +void Position_impl::x (CORBA::Float x ACE_ENV_ARG_DECL_NOT_USED) { this->xyz()[0] = x; } -CORBA::Float Position_impl::y (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +CORBA::Float Position_impl::y (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return this->xyz()[1]; } -void Position_impl::y (CORBA::Float y TAO_ENV_ARG_DECL_NOT_USED) +void Position_impl::y (CORBA::Float y ACE_ENV_ARG_DECL_NOT_USED) { this->xyz()[1] = y; } -CORBA::Float Position_impl::z (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +CORBA::Float Position_impl::z (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return this->xyz()[2]; } -void Position_impl::z (CORBA::Float z TAO_ENV_ARG_DECL_NOT_USED) +void Position_impl::z (CORBA::Float z ACE_ENV_ARG_DECL_NOT_USED) { this->xyz()[2] = z; } @@ -169,10 +169,10 @@ Log_Msg_impl::~Log_Msg_impl () } void -Log_Msg_impl::do_print (TAO_ENV_SINGLE_ARG_DECL) +Log_Msg_impl::do_print (ACE_ENV_SINGLE_ARG_DECL) { // The timestamp - Event_impl::do_print (TAO_ENV_SINGLE_ARG_PARAMETER); + Event_impl::do_print (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->urgency () > 0) @@ -221,20 +221,20 @@ Event_List_Link_impl::~Event_List_Link_impl () } Event* -Event_List_Link_impl::get_event (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Event_List_Link_impl::get_event (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return this->my_event (); } Event_List_Link* -Event_List_Link_impl::get_next_link (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Event_List_Link_impl::get_next_link (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return this->next (); } void Event_List_Link_impl::attach_next_link (Event_List_Link *n - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { this->next (n); } @@ -264,7 +264,7 @@ Event_List_impl::~Event_List_impl () } void -Event_List_impl::store_event (Event* e TAO_ENV_ARG_DECL_NOT_USED) +Event_List_impl::store_event (Event* e ACE_ENV_ARG_DECL_NOT_USED) { // This operation should perform atomically and should // guard against the access to the list from another thread. @@ -406,7 +406,7 @@ Temperature_Criterion_impl::~Temperature_Criterion_impl () CORBA::Boolean Temperature_Criterion_impl::is_critical (Event* e - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { // Downcast to a temperature. Temperature* t = Temperature::_downcast (e); @@ -423,7 +423,7 @@ Temperature_Criterion_impl::is_critical (Event* e void -Temperature_Criterion_impl::do_print (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Temperature_Criterion_impl::do_print (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { ACE_DEBUG((LM_DEBUG, "Alarm boundary for events with origin id %d is\n", this->origin_id_ () )); @@ -462,7 +462,7 @@ Position_Criterion_impl::~Position_Criterion_impl () CORBA::Boolean -Position_Criterion_impl::is_critical (Event* e TAO_ENV_ARG_DECL_NOT_USED) +Position_Criterion_impl::is_critical (Event* e ACE_ENV_ARG_DECL_NOT_USED) { Position* p = Position::_downcast (e); // Is Event really a Position ? @@ -483,13 +483,13 @@ Position_Criterion_impl::is_critical (Event* e TAO_ENV_ARG_DECL_NOT_USED) void -Position_Criterion_impl::do_print (TAO_ENV_SINGLE_ARG_DECL) +Position_Criterion_impl::do_print (ACE_ENV_SINGLE_ARG_DECL) { ACE_DEBUG((LM_DEBUG, "Alarm boundary for events with origin id %d is the box\n", this->origin_id_ () )); - this->leftbottom ()->do_print(TAO_ENV_SINGLE_ARG_PARAMETER); - this->topright ()->do_print(TAO_ENV_SINGLE_ARG_PARAMETER); + this->leftbottom ()->do_print(ACE_ENV_SINGLE_ARG_PARAMETER); + this->topright ()->do_print(ACE_ENV_SINGLE_ARG_PARAMETER); } Position_Criterion_factory::~Position_Criterion_factory () @@ -516,7 +516,7 @@ Log_Msg_Criterion_impl::~Log_Msg_Criterion_impl () CORBA::Boolean Log_Msg_Criterion_impl::is_critical (Event* e - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { Log_Msg* lm = Log_Msg::_downcast (e); @@ -530,7 +530,7 @@ Log_Msg_Criterion_impl::is_critical (Event* e void -Log_Msg_Criterion_impl::do_print (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Log_Msg_Criterion_impl::do_print (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { ACE_DEBUG((LM_DEBUG, "All log messages with urgency greater zero are registered.\n" )); @@ -565,7 +565,7 @@ Criterion_List_impl::~Criterion_List_impl () void Criterion_List_impl::store_criterion (Criterion *c - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { if (!my_list ()) { @@ -578,7 +578,7 @@ Criterion_List_impl::store_criterion (Criterion *c } CORBA::Boolean -Criterion_List_impl::is_critical (Event *e TAO_ENV_ARG_DECL_NOT_USED) +Criterion_List_impl::is_critical (Event *e ACE_ENV_ARG_DECL_NOT_USED) { // Try all criterions. Walking the list is efficient enough for // demonstration. diff --git a/TAO/examples/OBV/Typed_Events/Event_Types_impl.h b/TAO/examples/OBV/Typed_Events/Event_Types_impl.h index 35ed602229e..d330a23f372 100644 --- a/TAO/examples/OBV/Typed_Events/Event_Types_impl.h +++ b/TAO/examples/OBV/Typed_Events/Event_Types_impl.h @@ -48,7 +48,7 @@ class Event_impl : public virtual OBV_Event, Event_impl (); virtual ~Event_impl (); - virtual void do_print (TAO_ENV_SINGLE_ARG_DECL); + virtual void do_print (ACE_ENV_SINGLE_ARG_DECL); // Implementation of the do_print () operation the valuetype should have. // All operations in valuetypes are virtual. @@ -119,7 +119,7 @@ public: virtual ~Temperature_impl (); - virtual void do_print (TAO_ENV_SINGLE_ARG_DECL); + virtual void do_print (ACE_ENV_SINGLE_ARG_DECL); // Overrides Event_impl::do_print (). Note that a new declaration // in IDL in a derived class is not allowed. }; @@ -145,15 +145,15 @@ public: Position_impl (Point &p); virtual ~Position_impl (); - virtual CORBA::Float x (TAO_ENV_SINGLE_ARG_DECL); - virtual void x (CORBA::Float TAO_ENV_ARG_DECL); - virtual CORBA::Float y (TAO_ENV_SINGLE_ARG_DECL); - virtual void y (CORBA::Float TAO_ENV_ARG_DECL); - virtual CORBA::Float z (TAO_ENV_SINGLE_ARG_DECL); - virtual void z (CORBA::Float TAO_ENV_ARG_DECL); + virtual CORBA::Float x (ACE_ENV_SINGLE_ARG_DECL); + virtual void x (CORBA::Float ACE_ENV_ARG_DECL); + virtual CORBA::Float y (ACE_ENV_SINGLE_ARG_DECL); + virtual void y (CORBA::Float ACE_ENV_ARG_DECL); + virtual CORBA::Float z (ACE_ENV_SINGLE_ARG_DECL); + virtual void z (CORBA::Float ACE_ENV_ARG_DECL); //These are the attributes - virtual void do_print (TAO_ENV_SINGLE_ARG_DECL); + virtual void do_print (ACE_ENV_SINGLE_ARG_DECL); }; class Position_factory : public CORBA::ValueFactoryBase @@ -178,7 +178,7 @@ public: Log_Msg_impl (CORBA::Short urgency_p, const char *message_p); virtual ~Log_Msg_impl (); - virtual void do_print (TAO_ENV_SINGLE_ARG_DECL); + virtual void do_print (ACE_ENV_SINGLE_ARG_DECL); }; class Log_Msg_factory : public CORBA::ValueFactoryBase @@ -210,12 +210,12 @@ class Event_List_Link_impl : public virtual OBV_Event_List_Link, Event_List_Link_impl (Event *e); virtual ~Event_List_Link_impl (); - Event *get_event (TAO_ENV_SINGLE_ARG_DECL); + Event *get_event (ACE_ENV_SINGLE_ARG_DECL); private: - Event_List_Link *get_next_link (TAO_ENV_SINGLE_ARG_DECL); + Event_List_Link *get_next_link (ACE_ENV_SINGLE_ARG_DECL); - void attach_next_link (Event_List_Link * chain TAO_ENV_ARG_DECL); + void attach_next_link (Event_List_Link * chain ACE_ENV_ARG_DECL); // Attach a chain at the end. }; @@ -239,9 +239,9 @@ class Event_List_impl : public virtual OBV_Event_List, Event_List_impl (); virtual ~Event_List_impl (); - void store_event (Event* e TAO_ENV_ARG_DECL); + void store_event (Event* e ACE_ENV_ARG_DECL); - Event_List_Link *get_first_link(TAO_ENV_SINGLE_ARG_DECL); + Event_List_Link *get_first_link(ACE_ENV_SINGLE_ARG_DECL); // The iterator needs it. private: @@ -317,8 +317,8 @@ public: virtual ~Temperature_Criterion_impl (); - CORBA::Boolean is_critical (Event* e TAO_ENV_ARG_DECL); - virtual void do_print (TAO_ENV_SINGLE_ARG_DECL); + CORBA::Boolean is_critical (Event* e ACE_ENV_ARG_DECL); + virtual void do_print (ACE_ENV_SINGLE_ARG_DECL); }; class Temperature_Criterion_factory : public CORBA::ValueFactoryBase @@ -343,8 +343,8 @@ public: Position *tr); virtual ~Position_Criterion_impl (); - CORBA::Boolean is_critical (Event* e TAO_ENV_ARG_DECL); - virtual void do_print (TAO_ENV_SINGLE_ARG_DECL); + CORBA::Boolean is_critical (Event* e ACE_ENV_ARG_DECL); + virtual void do_print (ACE_ENV_SINGLE_ARG_DECL); }; class Position_Criterion_factory : public CORBA::ValueFactoryBase @@ -365,8 +365,8 @@ public: Log_Msg_Criterion_impl (); virtual ~Log_Msg_Criterion_impl (); - CORBA::Boolean is_critical (Event* e TAO_ENV_ARG_DECL); - virtual void do_print (TAO_ENV_SINGLE_ARG_DECL); + CORBA::Boolean is_critical (Event* e ACE_ENV_ARG_DECL); + virtual void do_print (ACE_ENV_SINGLE_ARG_DECL); }; class Log_Msg_Criterion_factory : public CORBA::ValueFactoryBase @@ -385,8 +385,8 @@ class Criterion_List_impl : public virtual OBV_Criterion_List, Criterion_List_impl (); virtual ~Criterion_List_impl (); - void store_criterion (Criterion *c TAO_ENV_ARG_DECL); - CORBA::Boolean is_critical (Event *e TAO_ENV_ARG_DECL); + void store_criterion (Criterion *c ACE_ENV_ARG_DECL); + CORBA::Boolean is_critical (Event *e ACE_ENV_ARG_DECL); }; diff --git a/TAO/examples/OBV/Typed_Events/Server_i.cpp b/TAO/examples/OBV/Typed_Events/Server_i.cpp index 1ac7c623802..ab79f8576e0 100644 --- a/TAO/examples/OBV/Typed_Events/Server_i.cpp +++ b/TAO/examples/OBV/Typed_Events/Server_i.cpp @@ -110,7 +110,7 @@ Checkpoint_i::orb (CORBA::ORB_ptr o) void Checkpoint_i::put_event (Event *event - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // In general this function would be a dispatcher which looks at the @@ -140,7 +140,7 @@ Checkpoint_i::put_event (Event *event Event_List * -Checkpoint_i::get_critical_events (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Checkpoint_i::get_critical_events (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // The skeleton should not steal our list by decrementing @@ -157,7 +157,7 @@ Checkpoint_i::get_critical_events (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) // Shutdown the server application. void -Checkpoint_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Checkpoint_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/examples/OBV/Typed_Events/Server_i.h b/TAO/examples/OBV/Typed_Events/Server_i.h index 3f3c0c00a2e..785093c5d14 100644 --- a/TAO/examples/OBV/Typed_Events/Server_i.h +++ b/TAO/examples/OBV/Typed_Events/Server_i.h @@ -37,16 +37,16 @@ public: virtual void put_event ( Event * e - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Event_List * get_critical_events ( - TAO_ENV_SINGLE_ARG_DECL + 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)); // Shutdown the server. diff --git a/TAO/examples/OBV/Typed_Events/server.cpp b/TAO/examples/OBV/Typed_Events/server.cpp index e04247695cd..935a93de0a9 100644 --- a/TAO/examples/OBV/Typed_Events/server.cpp +++ b/TAO/examples/OBV/Typed_Events/server.cpp @@ -12,18 +12,18 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "\n\tCheckpoint Event_Types server\n\n")); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { if (server.init ("Event_Types_Checkpoint", argc, argv - TAO_ENV_ARG_PARAMETER) == -1) + ACE_ENV_ARG_PARAMETER) == -1) return 1; else { - server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/examples/POA/Adapter_Activator/server.cpp b/TAO/examples/POA/Adapter_Activator/server.cpp index c47656ad461..a35bff017c0 100644 --- a/TAO/examples/POA/Adapter_Activator/server.cpp +++ b/TAO/examples/POA/Adapter_Activator/server.cpp @@ -61,7 +61,7 @@ public: CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent, const char *name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::PolicyList first_poa_policies_; @@ -83,7 +83,7 @@ Adapter_Activator::Adapter_Activator (PortableServer::POAManager_ptr poa_manager CORBA::Boolean Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent, const char *name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (ACE_OS::strcmp (name, "firstPOA") == 0) @@ -91,7 +91,7 @@ Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent, PortableServer::POA_var child = parent->create_POA (name, this->poa_manager_.in (), this->first_poa_policies_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Creation of firstPOA is over. Destroy the Policy objects. @@ -99,12 +99,12 @@ Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent, i < this->first_poa_policies_.length (); ++i) { - this->first_poa_policies_[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->first_poa_policies_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); } child->the_activator (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); Reference_Counted_Foo *foo_impl = new Reference_Counted_Foo (this->orb_.in (), @@ -112,12 +112,12 @@ Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent, 28); child->set_servant (foo_impl - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // This means that the ownership of <foo_impl> now belongs to // the POA. - foo_impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + foo_impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Finally everything is fine @@ -128,7 +128,7 @@ Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent, PortableServer::POA_var child = parent->create_POA (name, this->poa_manager_.in (), this->second_poa_policies_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Creation of secondPOA is over. Destroy the Policy objects. @@ -136,7 +136,7 @@ Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent, i < this->second_poa_policies_.length (); ++i) { - this->second_poa_policies_[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->second_poa_policies_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -149,12 +149,12 @@ Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent, child->activate_object_with_id (oid.in (), foo_impl - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // This means that the ownership of <foo_impl> now belongs to // the POA. - foo_impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + foo_impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Finally everything is fine @@ -264,7 +264,7 @@ write_iors_to_file (const char *first_ior, int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -272,7 +272,7 @@ main (int argc, char **argv) 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, argv); @@ -282,18 +282,18 @@ main (int argc, char **argv) // Obtain the RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POAManager of the RootPOA. 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; Adapter_Activator *adapter_activator = @@ -304,7 +304,7 @@ main (int argc, char **argv) adapter_activator; root_poa->the_activator (adapter_activator_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var first_poa; @@ -318,32 +318,32 @@ main (int argc, char **argv) // Id Assignment Policy policies[0] = root_poa->create_id_assignment_policy (PortableServer::SYSTEM_ID - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Lifespan policy policies[1] = root_poa->create_lifespan_policy (PortableServer::PERSISTENT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Request Processing policy policies[2] = root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Id Uniqueness policies[3] = root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create the firstPOA under the RootPOA. first_poa = root_poa->create_POA ("firstPOA", poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -355,20 +355,20 @@ main (int argc, char **argv) // Id Assignment Policy policies[0] = root_poa->create_id_assignment_policy (PortableServer::USER_ID - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Lifespan policy policies[1] = root_poa->create_lifespan_policy (PortableServer::PERSISTENT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create the secondPOA under the firstPOA. second_poa = first_poa->create_POA ("secondPOA", poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -379,16 +379,16 @@ main (int argc, char **argv) PortableServer::ObjectId_var first_oid = root_poa->activate_object (&first_foo_impl - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get Object Reference for the first_foo_impl object. - Foo_var first_foo = first_foo_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + Foo_var first_foo = first_foo_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var second_foo = first_poa->create_reference ("IDL:Foo:1.0" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var third_oid = @@ -397,20 +397,20 @@ main (int argc, char **argv) CORBA::Object_var third_foo = second_poa->create_reference_with_id (third_oid.in (), "IDL:Foo:1.0" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Stringyfy all the object references and print them out. CORBA::String_var first_ior = - orb->object_to_string (first_foo.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (first_foo.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var second_ior = - orb->object_to_string (second_foo.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (second_foo.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var third_ior = - orb->object_to_string (third_foo.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (third_foo.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -427,13 +427,13 @@ main (int argc, char **argv) first_poa->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_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/examples/POA/DSI/Database_i.cpp b/TAO/examples/POA/DSI/Database_i.cpp index d2e003927e2..fb953ff8b78 100644 --- a/TAO/examples/POA/DSI/Database_i.cpp +++ b/TAO/examples/POA/DSI/Database_i.cpp @@ -17,20 +17,20 @@ DatabaseImpl::Simpler_Database_Malloc::~Simpler_Database_Malloc (void) DatabaseImpl::Entry::Entry (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) : orb_ (CORBA::ORB::_duplicate (orb)), poa_ (PortableServer::POA::_duplicate (poa)) { // Get the POA Current object reference CORBA::Object_var obj = this->orb_->resolve_initial_references ("POACurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Narrow the object reference to a POA Current reference this->poa_current_ = PortableServer::Current::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -40,12 +40,12 @@ DatabaseImpl::Entry::~Entry (void) void DatabaseImpl::Entry::invoke (CORBA::ServerRequest_ptr request - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // The servant determines the key associated with the database // entry represented by self. PortableServer::ObjectId_var oid = - this->poa_current_->get_object_id (TAO_ENV_SINGLE_ARG_PARAMETER); + this->poa_current_->get_object_id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Now convert the id into a string @@ -59,7 +59,7 @@ DatabaseImpl::Entry::invoke (CORBA::ServerRequest_ptr request if (ACE_OS::strcmp (operation, "_is_a") == 0) { - this->is_a (request TAO_ENV_ARG_PARAMETER); + this->is_a (request ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else @@ -68,7 +68,7 @@ DatabaseImpl::Entry::invoke (CORBA::ServerRequest_ptr request void DatabaseImpl::Entry::is_a (CORBA::ServerRequest_ptr request - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::NVList_ptr list; this->orb_->create_list (0, list); @@ -78,15 +78,15 @@ DatabaseImpl::Entry::is_a (CORBA::ServerRequest_ptr request list->add_value ("value", any_1, CORBA::ARG_IN - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; request->arguments (list - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA_NamedValue_ptr nv = list->item (0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Any_ptr ap = nv->value (); @@ -94,7 +94,7 @@ DatabaseImpl::Entry::is_a (CORBA::ServerRequest_ptr request *ap >>= value; const char *object_id = - CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Boolean result; @@ -109,37 +109,37 @@ DatabaseImpl::Entry::is_a (CORBA::ServerRequest_ptr request CORBA::Any::from_boolean from_boolean (result); result_any <<= from_boolean; - request->set_result (result_any TAO_ENV_ARG_PARAMETER); + request->set_result (result_any ACE_ENV_ARG_PARAMETER); ACE_CHECK; } CORBA::RepositoryId DatabaseImpl::Entry::_primary_interface (const PortableServer::ObjectId &/*oid*/, PortableServer::POA_ptr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { return 0; } PortableServer::POA_ptr -DatabaseImpl::Entry::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +DatabaseImpl::Entry::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->poa_.in ()); } DatabaseImpl::Agent::Agent (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) : orb_ (CORBA::ORB::_duplicate (orb)), poa_ (PortableServer::POA::_duplicate (poa)), common_servant_ (orb, poa - TAO_ENV_ARG_PARAMETER) + ACE_ENV_ARG_PARAMETER) { ACE_CHECK; this->poa_->set_servant (&this->common_servant_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -151,7 +151,7 @@ Database::Entry_ptr DatabaseImpl::Agent::create_entry (const char *key, const char *entry_type, const Database::NVPairSequence &initial_attributes - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Database::Unknown_Type, Database::Duplicate_Key)) @@ -207,11 +207,11 @@ DatabaseImpl::Agent::create_entry (const char *key, CORBA::Object_var obj = this->poa_->create_reference_with_id (obj_id.in (), repository_id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Database::Entry::_nil ()); Database::Entry_var entry = Database::Entry::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Database::Entry::_nil ()); return entry._retn (); @@ -220,7 +220,7 @@ DatabaseImpl::Agent::create_entry (const char *key, Database::Entry_ptr DatabaseImpl::Agent::find_entry (const char *key, const char *entry_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Database::Unknown_Type, Database::Not_Found)) @@ -253,11 +253,11 @@ DatabaseImpl::Agent::find_entry (const char *key, CORBA::Object_var obj = this->poa_->create_reference_with_id (obj_id.in (), repository_id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Database::Entry::_nil ()); entry = Database::Entry::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Database::Entry::_nil ()); } else @@ -276,7 +276,7 @@ DatabaseImpl::Agent::find_entry (const char *key, void DatabaseImpl::Agent::destroy_entry (const char *key, const char *entry_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Database::Unknown_Type, Database::Unknown_Key)) @@ -310,14 +310,14 @@ DatabaseImpl::Agent::destroy_entry (const char *key, } void -DatabaseImpl::Agent::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +DatabaseImpl::Agent::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (); } PortableServer::POA_ptr -DatabaseImpl::Agent::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +DatabaseImpl::Agent::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/examples/POA/DSI/Database_i.h b/TAO/examples/POA/DSI/Database_i.h index db60ffbd981..25c120a7b0e 100644 --- a/TAO/examples/POA/DSI/Database_i.h +++ b/TAO/examples/POA/DSI/Database_i.h @@ -33,27 +33,27 @@ public: public: Entry (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); ~Entry (void); virtual void invoke (CORBA::ServerRequest_ptr request - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // The invoke() method receives requests issued to any CORBA // object incarnated by the DSI servant and performs the // processing necessary to execute the request. virtual CORBA::RepositoryId _primary_interface (const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // The _primary_interface() method receives an ObjectId value and // a POA_ptr as input parameters and returns a valid RepositoryId // representing the most-derived interface for that oid. - virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); // Returns the default POA for this servant. virtual void is_a (CORBA::ServerRequest_ptr request - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Handles the _is_a call protected: @@ -72,35 +72,35 @@ public: public: Agent (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); ~Agent (void); virtual Database::Entry_ptr create_entry (const char *key, const char *entry_type, const Database::NVPairSequence &initial_attributes - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Database::Unknown_Type, Database::Duplicate_Key)); virtual Database::Entry_ptr find_entry (const char *key, const char *entry_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Database::Unknown_Type, Database::Not_Found)); virtual void destroy_entry (const char *key, const char *entry_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Database::Unknown_Type, Database::Unknown_Key)); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); // Returns the default POA for this servant. protected: diff --git a/TAO/examples/POA/DSI/client.cpp b/TAO/examples/POA/DSI/client.cpp index 1d8950ce093..dd15e2008f5 100644 --- a/TAO/examples/POA/DSI/client.cpp +++ b/TAO/examples/POA/DSI/client.cpp @@ -99,7 +99,7 @@ read_IOR_from_file (void) int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; char str [255]; // Initialize the ORB @@ -110,7 +110,7 @@ main (int argc, char **argv) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - 0 TAO_ENV_ARG_PARAMETER); + 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse the command-line arguments to get the location of the @@ -133,7 +133,7 @@ main (int argc, char **argv) // Get the object reference with the IOR CORBA::Object_var object = orb->string_to_object (IOR - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_OS::strcpy (str, @@ -142,7 +142,7 @@ main (int argc, char **argv) // Narrow the object reference to a Database::Agent Database::Agent_var database_agent = Database::Agent::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Database::NVPairSequence employee_attributes (2); @@ -169,14 +169,14 @@ main (int argc, char **argv) database_agent->create_entry ("irfan", "Employee", employee_attributes - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_OS::strcpy (str, "Database::Employee::_narrow"); Database::Employee_var employee = Database::Employee::_narrow (entry.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; /* @@ -189,7 +189,7 @@ main (int argc, char **argv) #if 0 // Reset the id ACE_OS::strcpy (str, "Database::Employee::id"); - employee->id (666 TAO_ENV_ARG_PARAMETER); + employee->id (666 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* 0 */ @@ -197,19 +197,19 @@ main (int argc, char **argv) // Find the employee entry = database_agent->find_entry ("irfan", "Employee" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_OS::strcpy (str, "Database::Entry::destroy"); // Destroy the employee database_agent->destroy_entry ("irfan", "Employee" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (shutdown_server) { - database_agent->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + database_agent->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/examples/POA/DSI/server.cpp b/TAO/examples/POA/DSI/server.cpp index 54fa21c0aaf..cf8b886114c 100644 --- a/TAO/examples/POA/DSI/server.cpp +++ b/TAO/examples/POA/DSI/server.cpp @@ -79,12 +79,12 @@ write_iors_to_file (const char *first_ior) int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = parse_args (argc, argv); @@ -94,16 +94,16 @@ main (int argc, char **argv) // Obtain the RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow the object reference to a POA reference PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.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; CORBA::PolicyList policies (5); @@ -111,27 +111,27 @@ main (int argc, char **argv) // ID Assignment Policy policies[0] = - root_poa->create_id_assignment_policy (PortableServer::USER_ID TAO_ENV_ARG_PARAMETER); + root_poa->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Lifespan Policy policies[1] = root_poa->create_lifespan_policy (PortableServer::PERSISTENT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // Request Processing Policy policies[2] = root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // Servant Retention Policy policies[3] = - root_poa->create_servant_retention_policy (PortableServer::RETAIN TAO_ENV_ARG_PARAMETER); + root_poa->create_servant_retention_policy (PortableServer::RETAIN ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Id Uniqueness Policy policies[4] = - root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID TAO_ENV_ARG_PARAMETER); + root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -139,7 +139,7 @@ main (int argc, char **argv) PortableServer::POA_var first_poa = root_poa->create_POA (name.c_str (), poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; for (CORBA::ULong i = 0; @@ -147,14 +147,14 @@ main (int argc, char **argv) ++i) { CORBA::Policy_ptr policy = policies[i]; - policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } // Create a Database Agent Implementation object in first_poa DatabaseImpl::Agent database_agent_impl (orb.in (), first_poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var database_agent_oid = @@ -162,16 +162,16 @@ main (int argc, char **argv) first_poa->activate_object_with_id (database_agent_oid.in (), &database_agent_impl - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var database_agent = - first_poa->id_to_reference (database_agent_oid.in () TAO_ENV_ARG_PARAMETER); + first_poa->id_to_reference (database_agent_oid.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the IOR for the "DatabaseAgent" object CORBA::String_var database_agent_ior = - orb->object_to_string (database_agent.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (database_agent.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG,"%s\n", @@ -182,11 +182,11 @@ main (int argc, char **argv) return write_result; // set the state of the poa_manager to active i.e ready to process requests - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Run the ORB - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/POA/Default_Servant/File_i.cpp b/TAO/examples/POA/Default_Servant/File_i.cpp index a80188bd406..4cda27db3ba 100644 --- a/TAO/examples/POA/Default_Servant/File_i.cpp +++ b/TAO/examples/POA/Default_Servant/File_i.cpp @@ -24,9 +24,9 @@ FileImpl::System::System (PortableServer::POA_ptr poa) // Create the Default Descriptor Servant fd_servant_ (poa) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; // set the default servant of the POA - poa->set_servant (&this->fd_servant_ TAO_ENV_ARG_PARAMETER); + poa->set_servant (&this->fd_servant_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -35,7 +35,7 @@ FileImpl::System::~System (void) } PortableServer::POA_ptr -FileImpl::System::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +FileImpl::System::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -43,7 +43,7 @@ FileImpl::System::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) File::Descriptor_ptr FileImpl::System::open (const char *file_name, CORBA::Long flags - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, File::IOError)) { @@ -73,12 +73,12 @@ FileImpl::System::open (const char *file_name, CORBA::Object_var obj = this->poa_->create_reference_with_id (oid.in (), "IDL:File/Descriptor:1.0" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (File::Descriptor::_nil ()); // Narrow the object reference to a File Descriptor File::Descriptor_var fd = - File::Descriptor::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + File::Descriptor::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (File::Descriptor::_nil ()); @@ -96,26 +96,26 @@ FileImpl::Descriptor::~Descriptor (void) } PortableServer::POA_ptr -FileImpl::Descriptor::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +FileImpl::Descriptor::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->poa_.in ()); } //Extracts the ACE_HANDLE from the passed object reference ACE_HANDLE -FileImpl::Descriptor::fd (TAO_ENV_SINGLE_ARG_DECL) +FileImpl::Descriptor::fd (ACE_ENV_SINGLE_ARG_DECL) { // // One way of getting our id. // // Get a reference to myself - File::Descriptor_var me = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + File::Descriptor_var me = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (ACE_INVALID_HANDLE); // Get the ObjectId from the reference PortableServer::ObjectId_var oid1 = - this->poa_->reference_to_id (me.in () TAO_ENV_ARG_PARAMETER); + this->poa_->reference_to_id (me.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (ACE_INVALID_HANDLE); // @@ -123,7 +123,7 @@ FileImpl::Descriptor::fd (TAO_ENV_SINGLE_ARG_DECL) // PortableServer::ObjectId_var oid2 = - this->poa_->servant_to_id (this TAO_ENV_ARG_PARAMETER); + this->poa_->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (ACE_INVALID_HANDLE); // @@ -131,23 +131,23 @@ FileImpl::Descriptor::fd (TAO_ENV_SINGLE_ARG_DECL) // int argc = 0; - CORBA::ORB_var orb = CORBA::ORB_init (argc, 0, 0 TAO_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (argc, 0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (ACE_INVALID_HANDLE); // Get the POA Current object reference CORBA::Object_var obj = orb->resolve_initial_references ("POACurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (ACE_INVALID_HANDLE); // Narrow the object reference to a POA Current reference PortableServer::Current_var poa_current = PortableServer::Current::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (ACE_INVALID_HANDLE); PortableServer::ObjectId_var oid3 = - poa_current->get_object_id (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_current->get_object_id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (ACE_INVALID_HANDLE); ACE_ASSERT (oid1.in () == oid2.in ()); @@ -163,11 +163,11 @@ FileImpl::Descriptor::fd (TAO_ENV_SINGLE_ARG_DECL) CORBA::Long FileImpl::Descriptor::write (const File::Descriptor::DataBuffer &buffer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, File::IOError)) { - ACE_HANDLE file_descriptor = this->fd (TAO_ENV_SINGLE_ARG_PARAMETER); + ACE_HANDLE file_descriptor = this->fd (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); const CORBA::Octet *data = &buffer[0]; @@ -183,11 +183,11 @@ FileImpl::Descriptor::write (const File::Descriptor::DataBuffer &buffer File::Descriptor::DataBuffer * FileImpl::Descriptor::read (CORBA::Long num_bytes - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, File::IOError)) { - ACE_HANDLE file_descriptor = this->fd (TAO_ENV_SINGLE_ARG_PARAMETER); + ACE_HANDLE file_descriptor = this->fd (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Octet *buffer = File::Descriptor::DataBuffer::allocbuf (num_bytes); @@ -206,11 +206,11 @@ FileImpl::Descriptor::read (CORBA::Long num_bytes CORBA::ULong FileImpl::Descriptor::lseek (CORBA::ULong offset, CORBA::Long whence - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, File::IOError)) { - ACE_HANDLE file_descriptor = this->fd (TAO_ENV_SINGLE_ARG_PARAMETER); + ACE_HANDLE file_descriptor = this->fd (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Long result = (CORBA::Long) ACE_OS::lseek (file_descriptor, @@ -223,11 +223,11 @@ FileImpl::Descriptor::lseek (CORBA::ULong offset, } void -FileImpl::Descriptor::destroy (TAO_ENV_SINGLE_ARG_DECL) +FileImpl::Descriptor::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Get the ACE_HANDLE for this object reference - ACE_HANDLE file_descriptor = this->fd (TAO_ENV_SINGLE_ARG_PARAMETER); + ACE_HANDLE file_descriptor = this->fd (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Close the file corresponding to this object reference. diff --git a/TAO/examples/POA/Default_Servant/File_i.h b/TAO/examples/POA/Default_Servant/File_i.h index 30c6c6f5e5b..ebe06fce403 100644 --- a/TAO/examples/POA/Default_Servant/File_i.h +++ b/TAO/examples/POA/Default_Servant/File_i.h @@ -34,35 +34,35 @@ public: ~Descriptor (void); // Destructor - PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); // Returns the default POA of this object virtual CORBA::Long write (const File::Descriptor::DataBuffer &buffer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, File::IOError)); // write buffer to File corresponding to this Descriptor virtual File::Descriptor::DataBuffer *read (CORBA::Long num_bytes - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, // Reads num_bytes from the file and returns it File::IOError)); virtual CORBA::ULong lseek (CORBA::ULong offset, CORBA::Long whence - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, File::IOError)); // seek to the offset in file from whence - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // closes the file corresponding to the requested ObjectID private: - ACE_HANDLE fd (TAO_ENV_SINGLE_ARG_DECL); + ACE_HANDLE fd (ACE_ENV_SINGLE_ARG_DECL); // Extracts the ACE_HANDLE from the objectID PortableServer::POA_var poa_; @@ -80,12 +80,12 @@ public: ~System (void); //Destructor - PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); //Returns the default POA of this object File::Descriptor_ptr open (const char *file_name, CORBA::Long flags - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, File::IOError)); // Opens a file ,creates a Descriptor reference with the diff --git a/TAO/examples/POA/Default_Servant/client.cpp b/TAO/examples/POA/Default_Servant/client.cpp index b40fb6b4f5e..9782d810a77 100644 --- a/TAO/examples/POA/Default_Servant/client.cpp +++ b/TAO/examples/POA/Default_Servant/client.cpp @@ -72,12 +72,12 @@ parse_args (int argc, char **argv) int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse the command-line arguments to get the IOR @@ -106,18 +106,18 @@ main (int argc, char **argv) ACE_OS::close (input_file); CORBA::Object_var object = orb->string_to_object (ior.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow the object reference to a File::System File::System_var file_system = File::System::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Creat the file filename i.e "test" File::Descriptor_var fd = file_system->open (filename, O_CREAT | O_RDWR - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int message_length = ACE_OS::strlen (message) + 1; @@ -126,16 +126,16 @@ main (int argc, char **argv) File::Descriptor::DataBuffer data_sent (message_length, message_length, buffer, 1); // write the message to the file - fd->write (data_sent TAO_ENV_ARG_PARAMETER); + fd->write (data_sent ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; //seek to the beginning of the file - fd->lseek (0, SEEK_SET TAO_ENV_ARG_PARAMETER); + fd->lseek (0, SEEK_SET ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Read back the written message File::Descriptor::DataBuffer_var data_received = fd->read (message_length - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; char *result = (char *) &data_received[0]; @@ -145,7 +145,7 @@ main (int argc, char **argv) result)); // close the file - fd->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + fd->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/POA/Default_Servant/server.cpp b/TAO/examples/POA/Default_Servant/server.cpp index 5ff1c36ce5c..75f729016cb 100644 --- a/TAO/examples/POA/Default_Servant/server.cpp +++ b/TAO/examples/POA/Default_Servant/server.cpp @@ -58,12 +58,12 @@ parse_args (int argc, char **argv) int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = parse_args (argc, argv); @@ -73,14 +73,14 @@ main (int argc, char **argv) // Obtain the RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow the object reference to a POA reference - PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyList policies (5); @@ -88,34 +88,34 @@ main (int argc, char **argv) // ID Assignment Policy policies[0] = - root_poa->create_id_assignment_policy (PortableServer::USER_ID TAO_ENV_ARG_PARAMETER); + root_poa->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Lifespan Policy policies[1] = - root_poa->create_lifespan_policy (PortableServer::PERSISTENT TAO_ENV_ARG_PARAMETER); + root_poa->create_lifespan_policy (PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Request Processing Policy policies[2] = - root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT TAO_ENV_ARG_PARAMETER); + root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Servant Retention Policy policies[3] = - root_poa->create_servant_retention_policy (PortableServer::RETAIN TAO_ENV_ARG_PARAMETER); + root_poa->create_servant_retention_policy (PortableServer::RETAIN ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Id Uniqueness Policy policies[4] = - root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID TAO_ENV_ARG_PARAMETER); + root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_CString name = "firstPOA"; PortableServer::POA_var first_poa = root_poa->create_POA (name.c_str (), poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; for (CORBA::ULong i = 0; @@ -123,7 +123,7 @@ main (int argc, char **argv) ++i) { CORBA::Policy_ptr policy = policies[i]; - policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -135,16 +135,16 @@ main (int argc, char **argv) first_poa->activate_object_with_id (file_system_oid.in (), &file_system_impl - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var file_system = - first_poa->id_to_reference (file_system_oid.in () TAO_ENV_ARG_PARAMETER); + first_poa->id_to_reference (file_system_oid.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the IOR for the "FileSystem" object CORBA::String_var file_system_ior = - orb->object_to_string (file_system.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (file_system.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG,"%s\n", @@ -160,11 +160,11 @@ main (int argc, char **argv) ACE_OS::fclose (output_file); // set the state of the poa_manager to active i.e ready to process requests - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Run the ORB - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/examples/POA/Explicit_Activation/server.cpp b/TAO/examples/POA/Explicit_Activation/server.cpp index 410a364b7f5..3a45abc8b67 100644 --- a/TAO/examples/POA/Explicit_Activation/server.cpp +++ b/TAO/examples/POA/Explicit_Activation/server.cpp @@ -124,7 +124,7 @@ write_iors_to_file (const char *first_ior, int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -132,7 +132,7 @@ main (int argc, char **argv) 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, argv); @@ -142,18 +142,18 @@ main (int argc, char **argv) // Obtain the RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POAManager of the RootPOA. 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; // Policies for the firstPOA to be created. @@ -163,19 +163,19 @@ main (int argc, char **argv) // Id Assignment Policy policies[0] = root_poa->create_id_assignment_policy (PortableServer::USER_ID - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Lifespan policy policies[1] = root_poa->create_lifespan_policy (PortableServer::PERSISTENT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Threading policy policies[2] = root_poa->create_thread_policy (PortableServer::ORB_CTRL_MODEL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create the firstPOA under the RootPOA. @@ -184,16 +184,16 @@ main (int argc, char **argv) root_poa->create_POA (name.c_str (), poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - policies[2]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[2]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Threading policy policies[2] = root_poa->create_thread_policy (PortableServer::SINGLE_THREAD_MODEL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create the secondPOA under the firstPOA. @@ -202,7 +202,7 @@ main (int argc, char **argv) first_poa->create_POA (name.c_str (), poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Creation of POAs is over. Destroy the Policy objects. @@ -210,7 +210,7 @@ main (int argc, char **argv) i < policies.length (); ++i) { - policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -230,11 +230,11 @@ main (int argc, char **argv) // raises (ServantAlreadyActive, WrongPolicy); PortableServer::ObjectId_var first_oid = root_poa->activate_object (&first_foo_impl - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get Object Reference for the first_foo_impl object. - Foo_var first_foo = first_foo_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + Foo_var first_foo = first_foo_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Get ObjectId for object secondFoo and use that ObjectId to @@ -247,11 +247,11 @@ main (int argc, char **argv) first_poa->activate_object_with_id (second_oid.in (), &second_foo_impl - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get Object reference for second_foo_impl object. - Foo_var second_foo = second_foo_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + Foo_var second_foo = second_foo_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Get ObjectId for the string thirdPOA Create the object reference @@ -273,20 +273,20 @@ main (int argc, char **argv) CORBA::Object_var third_foo = second_poa->create_reference_with_id (third_oid.in (), "IDL:Foo:1.0" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Stringyfy all the object references and print them out. CORBA::String_var first_ior = - orb->object_to_string (first_foo.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (first_foo.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var second_ior = - orb->object_to_string (second_foo.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (second_foo.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var third_ior = - orb->object_to_string (third_foo.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (third_foo.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -305,13 +305,13 @@ main (int argc, char **argv) MyFooServant third_foo_impl (orb.in (), second_poa.in (), 29); second_poa->activate_object_with_id (third_oid.in (), &third_foo_impl - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_TIMEPROBE_PRINT; diff --git a/TAO/examples/POA/FindPOA/FindPOA.cpp b/TAO/examples/POA/FindPOA/FindPOA.cpp index d13eed56c18..91989c55e41 100644 --- a/TAO/examples/POA/FindPOA/FindPOA.cpp +++ b/TAO/examples/POA/FindPOA/FindPOA.cpp @@ -36,7 +36,7 @@ find_non_existant_POA (PortableServer::POA_ptr parent, PortableServer::POA_var child_poa = parent->find_POA (child_poa_name, activate - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (PortableServer::POA::AdapterNonExistent, foo) @@ -54,31 +54,31 @@ find_non_existant_POA (PortableServer::POA_ptr parent, int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; // Initialize the ORB ACE_TRY { - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow Object reference to RootPOA to a POA reference. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in() TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POAManager of the RootPOA. 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; // Try to find a non-existant POA. Since the Adapter Activator @@ -94,7 +94,7 @@ main (int argc, char **argv) // Register the TAO_Adapter_Activator reference to be the RootPOA's // Adapter Activator. root_poa->the_activator (activator.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Try to find a childPOA of RootPOA named firstPOA @@ -102,14 +102,14 @@ main (int argc, char **argv) PortableServer::POA_var first_poa = root_poa->find_POA (name.c_str (), 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; name = "secondPOA"; PortableServer::POA_var second_poa = first_poa->find_POA (name.c_str (), 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Try to find a non-existant POA. Even though the Adapter @@ -121,15 +121,15 @@ main (int argc, char **argv) // Get the names of all the POAs CORBA::String_var root_poa_name = - root_poa->the_name (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var first_poa_name = - first_poa->the_name (TAO_ENV_SINGLE_ARG_PARAMETER); + first_poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var second_poa_name = - second_poa->the_name (TAO_ENV_SINGLE_ARG_PARAMETER); + second_poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/examples/POA/Forwarding/MyFooServant.cpp b/TAO/examples/POA/Forwarding/MyFooServant.cpp index ac7acfc29ef..d22139f29fd 100644 --- a/TAO/examples/POA/Forwarding/MyFooServant.cpp +++ b/TAO/examples/POA/Forwarding/MyFooServant.cpp @@ -18,42 +18,42 @@ MyFooServant::MyFooServant (CORBA::ORB_ptr orb, } CORBA::Long -MyFooServant::doit (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +MyFooServant::doit (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_++; } void -MyFooServant::forward (TAO_ENV_SINGLE_ARG_DECL) +MyFooServant::forward (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Foo::Cannot_Forward)) { - this->activator_.forward_requests (TAO_ENV_SINGLE_ARG_PARAMETER); + this->activator_.forward_requests (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = this->poa_->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->poa_->deactivate_object (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -MyFooServant::shutdown (TAO_ENV_SINGLE_ARG_DECL) +MyFooServant::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; } PortableServer::POA_ptr -MyFooServant::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +MyFooServant::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/examples/POA/Forwarding/MyFooServant.h b/TAO/examples/POA/Forwarding/MyFooServant.h index fd27cedbcb3..8f3a21d1bfd 100644 --- a/TAO/examples/POA/Forwarding/MyFooServant.h +++ b/TAO/examples/POA/Forwarding/MyFooServant.h @@ -36,18 +36,18 @@ public: MyFooServantActivator &activator, CORBA::Long value); - virtual CORBA::Long doit (TAO_ENV_SINGLE_ARG_DECL) + virtual CORBA::Long doit (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Setup forwarding - virtual void forward (TAO_ENV_SINGLE_ARG_DECL) + virtual void forward (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Foo::Cannot_Forward)); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); // Returns the default POA for this servant. protected: diff --git a/TAO/examples/POA/Forwarding/Servant_Activator.cpp b/TAO/examples/POA/Forwarding/Servant_Activator.cpp index 0e6a08ded10..bc70ba7e938 100644 --- a/TAO/examples/POA/Forwarding/Servant_Activator.cpp +++ b/TAO/examples/POA/Forwarding/Servant_Activator.cpp @@ -15,12 +15,12 @@ MyFooServantActivator::MyFooServantActivator (CORBA::ORB_ptr orb, PortableServer::Servant MyFooServantActivator::incarnate (const PortableServer::ObjectId &, PortableServer::POA_ptr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)) { this->orb_->shutdown (0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Throw forward exception @@ -36,14 +36,14 @@ MyFooServantActivator::etherealize (const PortableServer::ObjectId &, PortableServer::Servant servant, CORBA::Boolean, CORBA::Boolean - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { delete servant; } void -MyFooServantActivator::forward_requests (TAO_ENV_SINGLE_ARG_DECL) +MyFooServantActivator::forward_requests (ACE_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->forward_to_.in ())) ACE_THROW (Foo::Cannot_Forward ()); diff --git a/TAO/examples/POA/Forwarding/Servant_Activator.h b/TAO/examples/POA/Forwarding/Servant_Activator.h index affd047814f..5ced44f1f9f 100644 --- a/TAO/examples/POA/Forwarding/Servant_Activator.h +++ b/TAO/examples/POA/Forwarding/Servant_Activator.h @@ -35,7 +35,7 @@ public: virtual PortableServer::Servant incarnate (const PortableServer::ObjectId & oid, PortableServer::POA_ptr adapter - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)); @@ -44,10 +44,10 @@ public: PortableServer::Servant serv, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void forward_requests (TAO_ENV_SINGLE_ARG_DECL); + void forward_requests (ACE_ENV_SINGLE_ARG_DECL); // Object should be forwarded from now on. private: diff --git a/TAO/examples/POA/Forwarding/client.cpp b/TAO/examples/POA/Forwarding/client.cpp index 781ee1a7ca2..6468da9c49d 100644 --- a/TAO/examples/POA/Forwarding/client.cpp +++ b/TAO/examples/POA/Forwarding/client.cpp @@ -67,14 +67,14 @@ parse_args (int argc, char **argv) void do_calls (Foo_ptr foo - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { for (int j = 1; j <= servers; j++) { for (int i = 1; i <= iterations; i++) { // Invoke the doit() method of the foo reference. - CORBA::Long result = foo->doit (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Long result = foo->doit (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Print the result of doit () method of the foo reference. @@ -88,7 +88,7 @@ do_calls (Foo_ptr foo { ACE_DEBUG ((LM_DEBUG, "Asking server to forward next time\n")); - foo->forward (TAO_ENV_SINGLE_ARG_PARAMETER); + foo->forward (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } @@ -98,12 +98,12 @@ do_calls (Foo_ptr foo int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize options based on command-line arguments. @@ -114,19 +114,19 @@ main (int argc, char **argv) // Get an object reference from the argument string. 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; // Try to narrow the object reference to a Foo reference. Foo_var foo = - Foo::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Foo::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; do_calls (foo.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - foo->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + foo->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/POA/Forwarding/server.cpp b/TAO/examples/POA/Forwarding/server.cpp index fd0acdefe82..eb617310753 100644 --- a/TAO/examples/POA/Forwarding/server.cpp +++ b/TAO/examples/POA/Forwarding/server.cpp @@ -64,7 +64,7 @@ parse_args (int argc, char **argv) PortableServer::POA_ptr setup_poa (PortableServer::POA_ptr root_poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Policies for the childPOA to be created. CORBA::PolicyList policies (2); @@ -73,17 +73,17 @@ setup_poa (PortableServer::POA_ptr root_poa // Tell the POA to use a servant manager. policies[0] = root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil ()); // Allow implicit activation. policies[1] = root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil ()); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil ()); // Create POA as child of RootPOA with the above policies. This POA @@ -92,7 +92,7 @@ setup_poa (PortableServer::POA_ptr root_poa root_poa->create_POA ("childPOA", poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil ()); // Creation of childPOAs is over. Destroy the Policy objects. @@ -100,7 +100,7 @@ setup_poa (PortableServer::POA_ptr root_poa i < policies.length (); ++i) { - policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (PortableServer::POA::_nil ()); } @@ -110,14 +110,14 @@ setup_poa (PortableServer::POA_ptr root_poa MyFooServantActivator * create_servant_manager (CORBA::ORB_ptr orb, PortableServer::POA_ptr child_poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Object_var forward_to; if (forward_to_ior) { forward_to = orb->string_to_object (forward_to_ior - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -129,7 +129,7 @@ create_servant_manager (CORBA::ORB_ptr orb, // Set MyFooServantActivator to be the servant activator. child_poa->set_servant_manager (activator - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // For the code above, we're using the CORBA 3.0 servant manager // semantics supported by TAO. For CORBA 2.x ORBs you'd need to // use the following code in place of the previous line: @@ -138,7 +138,7 @@ create_servant_manager (CORBA::ORB_ptr orb, // activator->_this (); // // child_poa->set_servant_manager (servant_activator.in (), - // TAO_ENV_SINGLE_ARG_PARAMETER); + // ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); MyFooServant *servant = 0; @@ -152,12 +152,12 @@ create_servant_manager (CORBA::ORB_ptr orb, PortableServer::ServantBase_var servant_var (servant); Foo_var foo = - servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::String_var ior = orb->object_to_string (foo.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); FILE *output_file = ACE_OS::fopen (ior_output_file, "w"); @@ -183,7 +183,7 @@ main (int argc, if (result == -1) return -1; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. @@ -191,43 +191,43 @@ main (int argc, CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POAManager of the RootPOA. 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; PortableServer::POA_var child_poa = setup_poa (root_poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ServantManager_var manager = create_servant_manager (orb.in (), child_poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/POA/Generic_Servant/MyFooServant.cpp b/TAO/examples/POA/Generic_Servant/MyFooServant.cpp index 241d420cd47..a28cdc05848 100644 --- a/TAO/examples/POA/Generic_Servant/MyFooServant.cpp +++ b/TAO/examples/POA/Generic_Servant/MyFooServant.cpp @@ -35,27 +35,27 @@ MyFooServant::~MyFooServant (void) // Return the Default POA of this Servant PortableServer::POA_ptr -MyFooServant::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +MyFooServant::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->poa_.in ()); } CORBA::Long -MyFooServant::doit (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +MyFooServant::doit (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; } void -MyFooServant::simply_doit (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +MyFooServant::simply_doit (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } void MyFooServant::timed_operation (CORBA::ULong timeout - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -69,10 +69,10 @@ MyFooServant::timed_operation (CORBA::ULong timeout } void -MyFooServant::shutdown (TAO_ENV_SINGLE_ARG_DECL) +MyFooServant::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); ACE_CHECK; } diff --git a/TAO/examples/POA/Generic_Servant/MyFooServant.h b/TAO/examples/POA/Generic_Servant/MyFooServant.h index e3b14fceeda..e715a747a18 100644 --- a/TAO/examples/POA/Generic_Servant/MyFooServant.h +++ b/TAO/examples/POA/Generic_Servant/MyFooServant.h @@ -29,23 +29,23 @@ public: virtual ~MyFooServant (void); // Destructor - virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); // Returns the Default POA of this Servant object - virtual CORBA::Long doit (TAO_ENV_SINGLE_ARG_DECL) + virtual CORBA::Long doit (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Simple doit method - virtual void simply_doit (TAO_ENV_SINGLE_ARG_DECL) + virtual void simply_doit (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Even simpler doit method virtual void timed_operation (CORBA::ULong timeout - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Timed operation. - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Shutdown the ORB diff --git a/TAO/examples/POA/Generic_Servant/client.cpp b/TAO/examples/POA/Generic_Servant/client.cpp index 121b62356a1..16f7dd3d5a0 100644 --- a/TAO/examples/POA/Generic_Servant/client.cpp +++ b/TAO/examples/POA/Generic_Servant/client.cpp @@ -155,7 +155,7 @@ read_IOR_from_file (void) int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -163,7 +163,7 @@ main (int argc, char **argv) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize options based on command-line arguments. @@ -180,17 +180,17 @@ main (int argc, char **argv) // Get an object reference from the argument string. CORBA::Object_var object = orb->string_to_object (IOR - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Try to narrow the object reference to a Foo reference. Foo_var foo = Foo::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = orb->object_to_string (foo.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -212,20 +212,20 @@ main (int argc, char **argv) if (oneway) { // Invoke the simply_doit() method of the foo reference. - foo->simply_doit (TAO_ENV_SINGLE_ARG_PARAMETER); + foo->simply_doit (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } else if (timed_operations) { // Invoke the timed_operation() method of the foo reference. foo->timed_operation (timeout - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else { // Invoke the doit() method of the foo reference. - result = foo->doit (TAO_ENV_SINGLE_ARG_PARAMETER); + result = foo->doit (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -239,7 +239,7 @@ main (int argc, char **argv) if (shutdown_server) { - foo->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + foo->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/examples/POA/Loader/Servant_Activator.cpp b/TAO/examples/POA/Loader/Servant_Activator.cpp index d0797662314..4fd9ea40348 100644 --- a/TAO/examples/POA/Loader/Servant_Activator.cpp +++ b/TAO/examples/POA/Loader/Servant_Activator.cpp @@ -66,7 +66,7 @@ ServantActivator_i::ServantActivator_i (CORBA::ORB_ptr orb, PortableServer::Servant ServantActivator_i::incarnate (const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)) { @@ -91,7 +91,7 @@ ServantActivator_i::etherealize (const PortableServer::ObjectId &oid, PortableServer::Servant servant, CORBA::Boolean, CORBA::Boolean remaining_activations - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // If there are no remaining activations i.e ObjectIds associated diff --git a/TAO/examples/POA/Loader/Servant_Activator.h b/TAO/examples/POA/Loader/Servant_Activator.h index aa514132129..38becd7117a 100644 --- a/TAO/examples/POA/Loader/Servant_Activator.h +++ b/TAO/examples/POA/Loader/Servant_Activator.h @@ -60,7 +60,7 @@ public: virtual PortableServer::Servant incarnate (const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)); // This method is invoked by a POA with USE_SERVANT_MANAGER and @@ -78,7 +78,7 @@ public: PortableServer::Servant servant, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This method is invoked whenever a MyFooServant for a MyFoo object // is deactivated. This occurs when the POA is destroyed or the diff --git a/TAO/examples/POA/Loader/Servant_Locator.cpp b/TAO/examples/POA/Loader/Servant_Locator.cpp index ce60de2ad7e..e59a44f7537 100644 --- a/TAO/examples/POA/Loader/Servant_Locator.cpp +++ b/TAO/examples/POA/Loader/Servant_Locator.cpp @@ -71,7 +71,7 @@ ServantLocator_i::preinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa, const char * /* operation */, PortableServer::ServantLocator::Cookie &cookie - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)) { @@ -102,7 +102,7 @@ ServantLocator_i::postinvoke (const PortableServer::ObjectId &oid, const char * /* operation */, PortableServer::ServantLocator::Cookie cookie, PortableServer::Servant servant - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // Check the passed servant with the cookie. diff --git a/TAO/examples/POA/Loader/Servant_Locator.h b/TAO/examples/POA/Loader/Servant_Locator.h index dc72a49eb6e..f8bab75628f 100644 --- a/TAO/examples/POA/Loader/Servant_Locator.h +++ b/TAO/examples/POA/Loader/Servant_Locator.h @@ -64,7 +64,7 @@ public: PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie &the_cookie - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)); // This method is invoked by a POA whenever it receives a request @@ -82,7 +82,7 @@ public: const char *operation, PortableServer::ServantLocator::Cookie the_cookie, PortableServer::Servant the_servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This method is invoked whenever a MyFooServant completes a // request. As the Servant Loactor interface is used when the POA diff --git a/TAO/examples/POA/Loader/Server_Manager.cpp b/TAO/examples/POA/Loader/Server_Manager.cpp index b6e2b933323..6993740bc61 100644 --- a/TAO/examples/POA/Loader/Server_Manager.cpp +++ b/TAO/examples/POA/Loader/Server_Manager.cpp @@ -108,14 +108,14 @@ Server_i::write_iors_to_file (const char *first_ior, int Server_i::init (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB. orb_ = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = parse_args (argc, argv); @@ -125,16 +125,16 @@ Server_i::init (int argc, char **argv) // Obtain the RootPOA. CORBA::Object_var obj = orb_->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow the Object reference to a POA reference root_poa_ = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POAManager of RootPOA - poa_manager_ = root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager_ = root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -158,7 +158,7 @@ Server_i::create_poa (const char *name, { PortableServer::POA_ptr my_poa = 0; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -168,21 +168,21 @@ Server_i::create_poa (const char *name, policies_[0] = root_poa_->create_id_assignment_policy (PortableServer::USER_ID - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Lifespan Policy. policies_[1] = root_poa_->create_lifespan_policy (PortableServer::PERSISTENT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Request Processing Policy. policies_[2] = root_poa_->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Servant Retention Policy. @@ -190,13 +190,13 @@ Server_i::create_poa (const char *name, policies_[3] = root_poa_->create_servant_retention_policy (PortableServer::RETAIN - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); if (servant_retention_policy == 0) policies_[3] = root_poa_->create_servant_retention_policy (PortableServer::NON_RETAIN - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create myPOA as the child of RootPOA with the above @@ -206,7 +206,7 @@ Server_i::create_poa (const char *name, my_poa = root_poa_->create_POA (name, poa_manager_.in (), policies_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Destroy the policy objects as they have been passed to @@ -216,7 +216,7 @@ Server_i::create_poa (const char *name, ++i) { CORBA::Policy_ptr policy = policies_[i]; - policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -236,7 +236,7 @@ Server_i::create_poa (const char *name, int Server_i::create_activator (PortableServer::POA_var first_poa) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -254,7 +254,7 @@ Server_i::create_activator (PortableServer::POA_var first_poa) // firstPOA. this->servant_activator_ = temp_servant_activator; first_poa->set_servant_manager (this->servant_activator_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // For the code above, we're using the CORBA 3.0 servant manager // semantics supported by TAO. For CORBA 2.x ORBs you'd need to // use the following code in place of the previous lines: @@ -262,7 +262,7 @@ Server_i::create_activator (PortableServer::POA_var first_poa) // this->servant_activator_ = temp_servant_activator->_this (); // // first_poa->set_servant_manager (this->servant_activator_.in () - // TAO_ENV_ARG_PARAMETER); + // ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create a reference with user created ID in firstPOA which @@ -272,7 +272,7 @@ Server_i::create_activator (PortableServer::POA_var first_poa) first_foo_ = first_poa->create_reference_with_id (first_foo_oid.in (), "IDL:Foo:1.0" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -290,7 +290,7 @@ Server_i::create_activator (PortableServer::POA_var first_poa) int Server_i::create_locator (PortableServer::POA_var second_poa) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -307,7 +307,7 @@ Server_i::create_locator (PortableServer::POA_var second_poa) // secondPOA. this->servant_locator_ = temp_servant_locator; second_poa->set_servant_manager (this->servant_locator_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // For the code above, we're using the CORBA 3.0 servant manager // semantics supported by TAO. For CORBA 2.x ORBs you'd need to // use the following code in place of the previous lines: @@ -317,7 +317,7 @@ Server_i::create_locator (PortableServer::POA_var second_poa) // Set ServantLocator_i object as the servant Manager of // secondPOA. // second_poa->set_servant_manager (this->servant_locator_.in () - // TAO_ENV_ARG_PARAMETER); + // ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Try to create a reference with user created ID in second_poa @@ -328,7 +328,7 @@ Server_i::create_locator (PortableServer::POA_var second_poa) second_foo_ = second_poa->create_reference_with_id (second_foo_oid.in (), "IDL:Foo:1.0" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -346,7 +346,7 @@ Server_i::create_locator (PortableServer::POA_var second_poa) int Server_i::run (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -355,12 +355,12 @@ Server_i::run (void) CORBA::String_var first_foo_ior = orb_->object_to_string (first_foo_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var second_foo_ior = orb_->object_to_string (second_foo_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Print the ior's of first_foo and second_foo. @@ -377,12 +377,12 @@ Server_i::run (void) // Set the poa_manager state to active, ready to process // requests. - poa_manager_->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Run the ORB. - orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/POA/NewPOA/NewPOA.cpp b/TAO/examples/POA/NewPOA/NewPOA.cpp index 16528209a04..40041f1252e 100644 --- a/TAO/examples/POA/NewPOA/NewPOA.cpp +++ b/TAO/examples/POA/NewPOA/NewPOA.cpp @@ -28,14 +28,14 @@ ACE_RCSID(NewPOA, NewPOA, "$Id$") void print_poa (PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::String_var poa_name = - poa->the_name (TAO_ENV_SINGLE_ARG_PARAMETER); + poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::OctetSeq_var poa_id = - poa->id (TAO_ENV_SINGLE_ARG_PARAMETER); + poa->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -58,7 +58,7 @@ print_poa (PortableServer::POA_ptr poa "\n")); PortableServer::POAList_var children = - poa->the_children (TAO_ENV_SINGLE_ARG_PARAMETER); + poa->the_children (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; for (CORBA::ULong index = 0; @@ -66,7 +66,7 @@ print_poa (PortableServer::POA_ptr poa ++index) { print_poa (children[index].in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -74,7 +74,7 @@ print_poa (PortableServer::POA_ptr poa int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -82,18 +82,18 @@ main (int argc, char **argv) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // _narrow() the Object to get the POA object, i.e., the root_poa. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Policies for the new POAs @@ -102,12 +102,12 @@ main (int argc, char **argv) // Threading policy policies[0] = - root_poa->create_thread_policy (PortableServer::ORB_CTRL_MODEL TAO_ENV_ARG_PARAMETER); + root_poa->create_thread_policy (PortableServer::ORB_CTRL_MODEL ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Lifespan policy policies[1] = - root_poa->create_lifespan_policy (PortableServer::TRANSIENT TAO_ENV_ARG_PARAMETER); + root_poa->create_lifespan_policy (PortableServer::TRANSIENT ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Creation of the firstPOA @@ -116,7 +116,7 @@ main (int argc, char **argv) root_poa->create_POA (name.c_str (), PortableServer::POAManager::_nil (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Creation of the new POA, i.e. firstPOA/secondPOA @@ -125,7 +125,7 @@ main (int argc, char **argv) first_poa->create_POA (name.c_str (), PortableServer::POAManager::_nil (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Creating thirdPOA. @@ -135,7 +135,7 @@ main (int argc, char **argv) root_poa->create_POA (name.c_str (), PortableServer::POAManager::_nil (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Creation of the new POAs over, so destroy the Policy_ptr's. @@ -144,26 +144,26 @@ main (int argc, char **argv) ++i) { CORBA::Policy_ptr policy = policies[i]; - policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } // Get the names of all the POAs and print them out. CORBA::String_var root_poa_name = - root_poa->the_name (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var first_poa_name = - first_poa->the_name (TAO_ENV_SINGLE_ARG_PARAMETER); + first_poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var second_poa_name = - second_poa->the_name (TAO_ENV_SINGLE_ARG_PARAMETER); + second_poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var third_poa_name = - third_poa->the_name (TAO_ENV_SINGLE_ARG_PARAMETER); + third_poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -174,7 +174,7 @@ main (int argc, char **argv) third_poa_name.in ())); print_poa (root_poa.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp b/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp index f7d810d91b3..386656aefe6 100644 --- a/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp +++ b/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp @@ -30,7 +30,7 @@ MyFooServantActivator::MyFooServantActivator (CORBA::ORB_ptr orb) PortableServer::Servant MyFooServantActivator::incarnate (const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)) { @@ -56,7 +56,7 @@ MyFooServantActivator::etherealize (const PortableServer::ObjectId &, PortableServer::Servant servant, CORBA::Boolean , CORBA::Boolean remaining_activations - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // If there are no remaining activations i.e ObjectIds associated diff --git a/TAO/examples/POA/On_Demand_Activation/Servant_Activator.h b/TAO/examples/POA/On_Demand_Activation/Servant_Activator.h index 9a59ae24937..ecd1d02be1e 100644 --- a/TAO/examples/POA/On_Demand_Activation/Servant_Activator.h +++ b/TAO/examples/POA/On_Demand_Activation/Servant_Activator.h @@ -26,7 +26,7 @@ public: virtual PortableServer::Servant incarnate (const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)); // This method is invoked by a POA with USE_SERVANT_MANAGER and @@ -38,7 +38,7 @@ public: PortableServer::Servant servant, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This method is invoked whenever a MyFooServant for a MyFoo object // is deactivated. diff --git a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp index 12edc90e4f3..21a684cf78d 100644 --- a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp +++ b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp @@ -34,7 +34,7 @@ MyFooServantLocator::preinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa, const char * /* operation */, PortableServer::ServantLocator::Cookie &cookie - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)) { @@ -67,7 +67,7 @@ MyFooServantLocator::postinvoke (const PortableServer::ObjectId & /* oid */, const char * /* operation */, PortableServer::ServantLocator::Cookie cookie, PortableServer::Servant servant - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // Check the passed servant with the cookie. diff --git a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.h b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.h index bea915fb46f..e2823db28ac 100644 --- a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.h +++ b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.h @@ -33,7 +33,7 @@ public: PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie &the_cookie - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)); // This method is invoked by a POA whenever it receives a request @@ -44,7 +44,7 @@ public: const char *operation, PortableServer::ServantLocator::Cookie the_cookie, PortableServer::Servant the_servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This method is invoked whenever a MyFooServant completes a // request. diff --git a/TAO/examples/POA/On_Demand_Activation/server.cpp b/TAO/examples/POA/On_Demand_Activation/server.cpp index 8c151381fa0..dc19aaf83fb 100644 --- a/TAO/examples/POA/On_Demand_Activation/server.cpp +++ b/TAO/examples/POA/On_Demand_Activation/server.cpp @@ -100,12 +100,12 @@ write_iors_to_file (const char *first_ior, int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB. - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = parse_args (argc, argv); @@ -115,18 +115,18 @@ main (int argc, char **argv) // Obtain the RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow the Object reference to a POA reference PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POAManager of RootPOA 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; @@ -135,24 +135,24 @@ main (int argc, char **argv) // ID Assignment Policy policies[0] = - root_poa->create_id_assignment_policy (PortableServer::USER_ID TAO_ENV_ARG_PARAMETER); + root_poa->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Lifespan Policy policies[1] = - root_poa->create_lifespan_policy (PortableServer::PERSISTENT TAO_ENV_ARG_PARAMETER); + root_poa->create_lifespan_policy (PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Request Processing Policy policies[2] = - root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER TAO_ENV_ARG_PARAMETER); + root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var first_poa; { // Servant Retention Policy policies[3] = - root_poa->create_servant_retention_policy (PortableServer::RETAIN TAO_ENV_ARG_PARAMETER); + root_poa->create_servant_retention_policy (PortableServer::RETAIN ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_CString name = "firstPOA"; @@ -162,7 +162,7 @@ main (int argc, char **argv) first_poa = root_poa->create_POA (name.c_str (), poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -171,7 +171,7 @@ main (int argc, char **argv) { // Servant Retention Policy policies[3] = - root_poa->create_servant_retention_policy (PortableServer::NON_RETAIN TAO_ENV_ARG_PARAMETER); + root_poa->create_servant_retention_policy (PortableServer::NON_RETAIN ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_CString name = "secondPOA"; @@ -182,7 +182,7 @@ main (int argc, char **argv) second_poa = root_poa->create_POA (name.c_str (), poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -194,7 +194,7 @@ main (int argc, char **argv) ++i) { CORBA::Policy_ptr policy = policies[i]; - policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -207,7 +207,7 @@ main (int argc, char **argv) // Set MyFooServantActivator object as the servant_manager of // firstPOA. first_poa->set_servant_manager (activator - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // For the code above, we're using the CORBA 3.0 servant manager // semantics supported by TAO. For CORBA 2.x ORBs you'd need to // use the following code in place of the previous line: @@ -216,7 +216,7 @@ main (int argc, char **argv) // activator->_this (); // // first_poa->set_servant_manager (servant_activator.in (), - // TAO_ENV_SINGLE_ARG_PARAMETER); + // ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Create a reference with user created ID in firstPOA which uses @@ -226,7 +226,7 @@ main (int argc, char **argv) PortableServer::string_to_ObjectId ("firstFoo"); CORBA::Object_var first_foo = - first_poa->create_reference_with_id (first_foo_oid.in (), "IDL:Foo:1.0" TAO_ENV_ARG_PARAMETER); + first_poa->create_reference_with_id (first_foo_oid.in (), "IDL:Foo:1.0" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Allocate the servant activator. @@ -238,7 +238,7 @@ main (int argc, char **argv) // Set MyFooServantLocator object as the servant Manager of // secondPOA. second_poa->set_servant_manager (locator - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // For the code above, we're using the CORBA 3.0 servant manager // semantics supported by TAO. For CORBA 2.x ORBs you'd need to // use the following code in place of the previous line: @@ -247,7 +247,7 @@ main (int argc, char **argv) // locator->_this (); // // second_poa->set_servant_manager (servant_locator.in (), - // TAO_ENV_SINGLE_ARG_PARAMETER); + // ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Try to create a reference with user created ID in second_poa @@ -258,19 +258,19 @@ main (int argc, char **argv) CORBA::Object_var second_foo = second_poa->create_reference_with_id (second_foo_oid.in (), - "IDL:Foo:1.0" TAO_ENV_ARG_PARAMETER); + "IDL:Foo:1.0" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Invoke object_to_string on the references created in firstPOA and // secondPOA. CORBA::String_var first_foo_ior = - orb->object_to_string (first_foo.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (first_foo.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var second_foo_ior = - orb->object_to_string (second_foo.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (second_foo.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Print the ior's of first_foo and second_foo. @@ -285,11 +285,11 @@ main (int argc, char **argv) return write_result; // Set the poa_manager state to active, ready to process requests. - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Run the ORB. - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp index 53ac5c7f696..37a8deb7ca3 100644 --- a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp +++ b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp @@ -33,7 +33,7 @@ ServantActivator_i::ServantActivator_i (CORBA::ORB_ptr orb) PortableServer::Servant ServantActivator_i::incarnate (const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)) { @@ -62,7 +62,7 @@ ServantActivator_i::etherealize (const PortableServer::ObjectId &oid, PortableServer::Servant servant, CORBA::Boolean, CORBA::Boolean remaining_activations - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // If there are no remaining activations i.e ObjectIds associated diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.h b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.h index 0ce43922984..60ebef0f510 100644 --- a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.h +++ b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.h @@ -38,7 +38,7 @@ public: virtual PortableServer::Servant incarnate (const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)); // This method is invoked by a POA with USE_SERVANT_MANAGER and @@ -56,7 +56,7 @@ public: PortableServer::Servant servant, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This method is invoked whenever a MyFooServant for a MyFoo object // is deactivated. This occurs when the POA is destroyed or the diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp index 2155e074ab5..69130be8720 100644 --- a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp +++ b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp @@ -35,7 +35,7 @@ ServantLocator_i::preinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa, const char * /* operation */, PortableServer::ServantLocator::Cookie &cookie - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)) { @@ -74,7 +74,7 @@ ServantLocator_i::postinvoke (const PortableServer::ObjectId &oid, const char * /* operation */, PortableServer::ServantLocator::Cookie cookie, PortableServer::Servant servant - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // Check the passed servant with the cookie. diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h index 5efee2c24f8..f28a90d2ff6 100644 --- a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h +++ b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h @@ -43,7 +43,7 @@ public: PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie &the_cookie - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)); // This method is invoked by a POA whenever it receives a request @@ -61,7 +61,7 @@ public: const char *operation, PortableServer::ServantLocator::Cookie the_cookie, PortableServer::Servant the_servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This method is invoked whenever a MyFooServant completes a // request. As the Servant Loactor interface is used when the POA diff --git a/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp b/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp index c0c74fb87a4..75781ee9f81 100644 --- a/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp +++ b/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp @@ -112,7 +112,7 @@ Server_i::write_iors_to_file (const char *first_ior, int Server_i::init (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -120,7 +120,7 @@ Server_i::init (int argc, char **argv) orb_ = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = parse_args (argc, argv); @@ -130,16 +130,16 @@ Server_i::init (int argc, char **argv) // Obtain the RootPOA. CORBA::Object_var obj = orb_->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Narrow the Object reference to a POA reference root_poa_ = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POAManager of RootPOA - poa_manager_ = root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager_ = root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -163,7 +163,7 @@ Server_i::create_poa (const char *name, { PortableServer::POA_ptr my_poa = 0; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { policies_.length (4); @@ -172,21 +172,21 @@ Server_i::create_poa (const char *name, policies_[0] = root_poa_->create_id_assignment_policy (PortableServer::USER_ID - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Lifespan Policy. policies_[1] = root_poa_->create_lifespan_policy (PortableServer::PERSISTENT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Request Processing Policy. policies_[2] = root_poa_->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Servant Retention Policy. @@ -194,14 +194,14 @@ Server_i::create_poa (const char *name, policies_[3] = root_poa_->create_servant_retention_policy (PortableServer::RETAIN - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (servant_retention_policy == 0) policies_[3] = root_poa_->create_servant_retention_policy (PortableServer::NON_RETAIN - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Create myPOA as the child of RootPOA with the above @@ -211,7 +211,7 @@ Server_i::create_poa (const char *name, my_poa = root_poa_->create_POA (name, poa_manager_.in (), policies_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Destroy the policy objects as they have been passed to @@ -221,7 +221,7 @@ Server_i::create_poa (const char *name, ++i) { CORBA::Policy_ptr policy = policies_[i]; - policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -241,7 +241,7 @@ Server_i::create_poa (const char *name, int Server_i::create_activator (PortableServer::POA_var first_poa) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // An Servant Activator object is created which will activate @@ -253,7 +253,7 @@ Server_i::create_activator (PortableServer::POA_var first_poa) // Set ServantActivator_i object as the servant_manager of // firstPOA. first_poa->set_servant_manager (servant_activator_impl_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // For the code above, we're using the CORBA 3.0 servant manager // semantics supported by TAO. For CORBA 2.x ORBs you'd need to // use the following code in place of the previous line: @@ -262,7 +262,7 @@ Server_i::create_activator (PortableServer::POA_var first_poa) // servant_activator_impl_->_this (); // // first_poa->set_servant_manager (servant_activator.in (), - // TAO_ENV_SINGLE_ARG_PARAMETER); + // ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Create a reference with user created ID in firstPOA which @@ -276,7 +276,7 @@ Server_i::create_activator (PortableServer::POA_var first_poa) first_foo_ = first_poa->create_reference_with_id (first_foo_oid.in (), "IDL:Foo:1.0" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -294,7 +294,7 @@ Server_i::create_activator (PortableServer::POA_var first_poa) int Server_i::create_locator (PortableServer::POA_var second_poa) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // An Servant Locator object is created which will activate @@ -306,7 +306,7 @@ Server_i::create_locator (PortableServer::POA_var second_poa) // Set ServantLocator_i object as the servant Manager of // secondPOA. second_poa->set_servant_manager (servant_locator_impl_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); // For the code above, we're using the CORBA 3.0 servant manager // semantics supported by TAO. For CORBA 2.x ORBs you'd need to // use the following code in place of the previous line: @@ -314,7 +314,7 @@ Server_i::create_locator (PortableServer::POA_var second_poa) // servant_loator_impl_->_this (); // // second_poa->set_servant_manager (servant_locator_impl_, - // TAO_ENV_SINGLE_ARG_PARAMETER); + // ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Try to create a reference with user created ID in second_poa @@ -328,7 +328,7 @@ Server_i::create_locator (PortableServer::POA_var second_poa) second_foo_ = second_poa->create_reference_with_id (second_foo_oid.in (), "IDL:Foo:1.0" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -346,7 +346,7 @@ Server_i::create_locator (PortableServer::POA_var second_poa) int Server_i::run (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Invoke object_to_string on the references created in firstPOA @@ -354,12 +354,12 @@ Server_i::run (void) CORBA::String_var first_foo_ior = orb_->object_to_string (first_foo_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var second_foo_ior = orb_->object_to_string (second_foo_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Print the ior's of first_foo and second_foo. @@ -376,15 +376,15 @@ Server_i::run (void) // Set the poa_manager state to active, ready to process // requests. - poa_manager_->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Run the ORB. - orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/POA/Reference_Counted_Servant/server.cpp b/TAO/examples/POA/Reference_Counted_Servant/server.cpp index 448d2d6ff3e..1c8a0812a1f 100644 --- a/TAO/examples/POA/Reference_Counted_Servant/server.cpp +++ b/TAO/examples/POA/Reference_Counted_Servant/server.cpp @@ -108,7 +108,7 @@ write_iors_to_file (const char *ior) int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -116,7 +116,7 @@ main (int argc, char **argv) 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, argv); @@ -126,18 +126,18 @@ main (int argc, char **argv) // Obtain the RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POAManager of the RootPOA. 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; // Create a servant. @@ -149,16 +149,16 @@ main (int argc, char **argv) -1); // Get Object Reference for the foo_impl object. - Foo_var foo = foo_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + Foo_var foo = foo_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // This means that the ownership of <foo_impl> now belongs to // the POA. - foo_impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + foo_impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Stringyfy all the object references and print them out. - CORBA::String_var ior = orb->object_to_string (foo.in () TAO_ENV_ARG_PARAMETER); + CORBA::String_var ior = orb->object_to_string (foo.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -169,10 +169,10 @@ main (int argc, char **argv) if (write_result != 0) return write_result; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/POA/RootPOA/RootPOA.cpp b/TAO/examples/POA/RootPOA/RootPOA.cpp index 007bbf9aa05..d9c6a8ba94b 100644 --- a/TAO/examples/POA/RootPOA/RootPOA.cpp +++ b/TAO/examples/POA/RootPOA/RootPOA.cpp @@ -26,30 +26,30 @@ ACE_RCSID(RootPOA, RootPOA, "$Id$") int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initilize the ORB - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Resolve the initial references for the name RootPOA thus getting // an object of type CORBA::Object. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // apply _narrow on the object of type CORBA::Object, to make it // a POA class Object. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the name of the root POA. CORBA::String_var poa_name = - root_poa->the_name (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/examples/POA/TIE/Foo_i.cpp b/TAO/examples/POA/TIE/Foo_i.cpp index 65d50eaa5e9..918fe3f149d 100644 --- a/TAO/examples/POA/TIE/Foo_i.cpp +++ b/TAO/examples/POA/TIE/Foo_i.cpp @@ -26,7 +26,7 @@ ACE_RCSID(TIE, Foo_i, "$Id$") // Return this->value CORBA::Long -Tie_i::doit (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Tie_i::doit (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; @@ -42,7 +42,7 @@ A_i::A_i (CORBA::Long value, // Return this->value CORBA::Long -A_i::doit (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +A_i::doit (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; @@ -50,7 +50,7 @@ A_i::doit (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) // Return the Default POA of this Servant PortableServer::POA_ptr -A_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +A_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -65,7 +65,7 @@ Outer_i::B_i::B_i (CORBA::Long value, // Return this->value CORBA::Long -Outer_i::B_i::doit (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Outer_i::B_i::doit (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; @@ -73,7 +73,7 @@ Outer_i::B_i::doit (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) // Return the Default POA of this Servant PortableServer::POA_ptr -Outer_i::B_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Outer_i::B_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -88,7 +88,7 @@ Outer_i::Inner_i::C_i::C_i (CORBA::Long value, // Return this->value CORBA::Long -Outer_i::Inner_i::C_i::doit (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Outer_i::Inner_i::C_i::doit (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; @@ -96,7 +96,7 @@ Outer_i::Inner_i::C_i::doit (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) // Return the Default POA of this Servant PortableServer::POA_ptr -Outer_i::Inner_i::C_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Outer_i::Inner_i::C_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/examples/POA/TIE/Foo_i.h b/TAO/examples/POA/TIE/Foo_i.h index 1b3e190bd97..218597d4e3e 100644 --- a/TAO/examples/POA/TIE/Foo_i.h +++ b/TAO/examples/POA/TIE/Foo_i.h @@ -25,7 +25,7 @@ public: Tie_i (CORBA::Long value); // Simple doit method - virtual CORBA::Long doit (TAO_ENV_SINGLE_ARG_DECL) + virtual CORBA::Long doit (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); protected: @@ -41,11 +41,11 @@ public: PortableServer::POA_ptr poa); // Simple doit method - virtual CORBA::Long doit (TAO_ENV_SINGLE_ARG_DECL) + virtual CORBA::Long doit (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns the Default POA of this Servant object - virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); protected: @@ -67,11 +67,11 @@ public: PortableServer::POA_ptr poa); // Simple doit method - virtual CORBA::Long doit (TAO_ENV_SINGLE_ARG_DECL) + virtual CORBA::Long doit (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns the Default POA of this Servant object - virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); protected: @@ -93,11 +93,11 @@ public: PortableServer::POA_ptr poa); // Simple doit method - virtual CORBA::Long doit (TAO_ENV_SINGLE_ARG_DECL) + virtual CORBA::Long doit (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns the Default POA of this Servant object - virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); protected: diff --git a/TAO/examples/POA/TIE/client.cpp b/TAO/examples/POA/TIE/client.cpp index 3629894c231..25dd5ef60af 100644 --- a/TAO/examples/POA/TIE/client.cpp +++ b/TAO/examples/POA/TIE/client.cpp @@ -110,27 +110,27 @@ class Test public: static void run (CORBA::ORB_ptr orb, char *IOR - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (IOR != 0) { // Get an object reference from the argument string. - CORBA::Object_var object = orb->string_to_object (IOR TAO_ENV_ARG_PARAMETER); + CORBA::Object_var object = orb->string_to_object (IOR ACE_ENV_ARG_PARAMETER); ACE_CHECK; - /*if (TAO_ENV_SINGLE_ARG_PARAMETER.exception () != 0) + /*if (ACE_ENV_SINGLE_ARG_PARAMETER.exception () != 0) { - TAO_ENV_ARG_PARAMETER.print_exception ("CORBA::ORB::string_to_object"); + ACE_ENV_ARG_PARAMETER.print_exception ("CORBA::ORB::string_to_object"); return; } */ // Try to narrow the object reference to a reference. - T_var foo = T::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + T_var foo = T::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; - /*if (TAO_ENV_SINGLE_ARG_PARAMETER.exception () != 0) + /*if (ACE_ENV_SINGLE_ARG_PARAMETER.exception () != 0) { - TAO_ENV_ARG_PARAMETER.print_exception ("_narrow"); + ACE_ENV_ARG_PARAMETER.print_exception ("_narrow"); return; } */ @@ -145,7 +145,7 @@ public: for (i = 0; i < iterations ; i++) { // Invoke the doit() method on the reference. - result = foo->doit (TAO_ENV_SINGLE_ARG_PARAMETER); + result = foo->doit (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -156,9 +156,9 @@ public: // compute average time. print_stats (elapsed_time, i); - /*if (TAO_ENV_SINGLE_ARG_PARAMETER.exception () != 0) + /*if (ACE_ENV_SINGLE_ARG_PARAMETER.exception () != 0) { - TAO_ENV_ARG_PARAMETER.print_exception ("doit"); + ACE_ENV_ARG_PARAMETER.print_exception ("doit"); return; } */ @@ -173,11 +173,11 @@ public: int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Initialize options based on command-line arguments. @@ -189,32 +189,32 @@ main (int argc, char **argv) Test<A, A_var>::run (orb.in (), IOR[i++] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test<Outer::B, Outer::B_var>::run (orb.in (), IOR[i++] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test<Outer::Inner::C, Outer::Inner::C_var>::run (orb.in (), IOR[i++] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test<A, A_var>::run (orb.in (), IOR[i++] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test<Outer::B, Outer::B_var>::run (orb.in (), IOR[i++] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test<Outer::Inner::C, Outer::Inner::C_var>::run (orb.in (), IOR[i++] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/POA/TIE/server.cpp b/TAO/examples/POA/TIE/server.cpp index c34a7549e4e..18890eb8a55 100644 --- a/TAO/examples/POA/TIE/server.cpp +++ b/TAO/examples/POA/TIE/server.cpp @@ -22,7 +22,7 @@ ACE_RCSID(TIE, server, "$Id$") int main (int argc, char **argv) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; char str[256]; @@ -31,26 +31,26 @@ main (int argc, char **argv) ACE_OS::strcpy (str, "CORBA::ORB_init"); // Initialize the ORB first. - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the RootPOA. CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_OS::strcpy (str, "PortableServer::POA::_narrow"); // Get the POA_var object from Object_var. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_OS::strcpy (str, "PortableServer::POA::the_POAManager"); // Get the POAManager of the RootPOA. 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; @@ -61,13 +61,13 @@ main (int argc, char **argv) ACE_OS::strcpy (str,"PortableServer::POA::create_lifespan_policy"); // Lifespan policy policies[0] = - root_poa->create_lifespan_policy (PortableServer::PERSISTENT TAO_ENV_ARG_PARAMETER); + root_poa->create_lifespan_policy (PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_OS::strcpy (str, "PortableServer::POA::create_implicit_activation_policy"); // Implicit activation policy policies[1] = - root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION TAO_ENV_ARG_PARAMETER); + root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_OS::strcpy (str, "PortableServer::POA::create_POA"); @@ -77,7 +77,7 @@ main (int argc, char **argv) root_poa->create_POA (name.c_str (), poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -89,7 +89,7 @@ main (int argc, char **argv) ++i) { CORBA::Policy_ptr policy = policies[i]; - policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -119,34 +119,34 @@ main (int argc, char **argv) ACE_OS::strcpy (str, "POA_A::_this"); // Get Object Reference for the a_impl object. - A_var a = a_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + A_var a = a_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_OS::strcpy (str, "POA_Outer::B::_this"); // Get Object Reference for the b_impl object. - Outer::B_var b = b_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + Outer::B_var b = b_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_OS::strcpy (str, "POA_Outer::Inner::C::_this"); // Get Object Reference for the c_impl object. - Outer::Inner::C_var c = c_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + Outer::Inner::C_var c = c_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; #if defined (ACE_HAS_USING_KEYWORD) ACE_OS::strcpy (str, "POA_A::_this"); // Get Object Reference for the a_tie_impl object. - A_var a_tie = a_tie_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + A_var a_tie = a_tie_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_OS::strcpy (str, "POA_Outer::B::_this"); // Get Object Reference for the a_tie_impl object. - Outer::B_var b_tie = b_tie_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + Outer::B_var b_tie = b_tie_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_OS::strcpy (str, "POA_Outer::C::_this"); // Get Object Reference for the c_tie_impl object. - Outer::Inner::C_var c_tie = c_tie_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + Outer::Inner::C_var c_tie = c_tie_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* ACE_HAS_USING_KEYWORD */ @@ -154,23 +154,23 @@ main (int argc, char **argv) ACE_OS::strcpy (str, "CORBA::ORB::object_to_string"); // Stringyfy all the object references and print them out. CORBA::String_var first_ior = - orb->object_to_string (a.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (a.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Stringyfy all the object references and print them out. CORBA::String_var second_ior = - orb->object_to_string (b.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (b.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Stringyfy all the object references and print them out. CORBA::String_var third_ior = - orb->object_to_string (c.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (c.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #if defined (ACE_HAS_USING_KEYWORD) // Stringyfy all the object references and print them out. CORBA::String_var forth_ior = - orb->object_to_string (a_tie.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (a_tie.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; FILE *output_file_1 = ACE_OS::fopen ("ior_1", "w"); @@ -203,13 +203,13 @@ main (int argc, char **argv) // Stringyfy all the object references and print them out. CORBA::String_var fifth_ior = - orb->object_to_string (b_tie.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (b_tie.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Stringyfy all the object references and print them out. CORBA::String_var sixth_ior = - orb->object_to_string (c_tie.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (c_tie.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; FILE *output_file_5 = ACE_OS::fopen ("ior_5", "w"); @@ -229,10 +229,10 @@ main (int argc, char **argv) #endif /* ACE_HAS_USING_KEYWORD */ - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Persistent_Grid/Grid_Client_i.cpp b/TAO/examples/Persistent_Grid/Grid_Client_i.cpp index 46c7be99dbd..2acbc958bdd 100644 --- a/TAO/examples/Persistent_Grid/Grid_Client_i.cpp +++ b/TAO/examples/Persistent_Grid/Grid_Client_i.cpp @@ -67,7 +67,7 @@ Grid_Client_i::run (const char *name, if (this->parse_args (argc, argv) == -1) return -1; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -75,7 +75,7 @@ Grid_Client_i::run (const char *name, Grid_ptr grid = client->make_grid (width_, height_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -91,7 +91,7 @@ Grid_Client_i::run (const char *name, grid->set (index_, ctr, (value_ + ctr) - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -103,7 +103,7 @@ Grid_Client_i::run (const char *name, ACE_TRY_CHECK; if (client.shutdown () == 1) { - client->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + client->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/examples/Persistent_Grid/Grid_i.cpp b/TAO/examples/Persistent_Grid/Grid_i.cpp index 29f586b7808..0502f60e8df 100644 --- a/TAO/examples/Persistent_Grid/Grid_i.cpp +++ b/TAO/examples/Persistent_Grid/Grid_i.cpp @@ -63,7 +63,7 @@ void Grid_i::set (CORBA::Short x, CORBA::Short y, CORBA::Long value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Grid::RANGE_ERROR)) { @@ -81,7 +81,7 @@ Grid_i::set (CORBA::Short x, CORBA::Long Grid_i::get (CORBA::Short x, CORBA::Short y - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Grid::RANGE_ERROR)) { @@ -97,14 +97,14 @@ Grid_i::get (CORBA::Short x, // Access methods. CORBA::Short -Grid_i::width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Grid_i::width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->width_; } CORBA::Short -Grid_i::height (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Grid_i::height (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->height_; @@ -112,7 +112,7 @@ Grid_i::height (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void Grid_i::width (CORBA::Short x - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->width_ = x; @@ -120,7 +120,7 @@ Grid_i::width (CORBA::Short x void Grid_i::height (CORBA::Short y - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->height_ = y; @@ -128,7 +128,7 @@ Grid_i::height (CORBA::Short y // Destroy the grid void -Grid_i::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED ) +Grid_i::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { // Delete the array. @@ -180,7 +180,7 @@ Grid_Factory_i::~Grid_Factory_i (void) Grid_ptr Grid_Factory_i::make_grid (CORBA::Short width, CORBA::Short height - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -215,7 +215,7 @@ Grid_Factory_i::make_grid (CORBA::Short width, grid_ptr->set_pool (pool_t_); // Register the Grid pointer. - return grid_ptr->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + return grid_ptr->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } // Set the ORB pointer. @@ -228,7 +228,7 @@ Grid_Factory_i::orb (CORBA::ORB_ptr o) // Shutdown. void -Grid_Factory_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Grid_Factory_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -240,7 +240,7 @@ Grid_Factory_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } void -Grid_Factory_i::cleanup (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Grid_Factory_i::cleanup (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { const char *name = "Array"; diff --git a/TAO/examples/Persistent_Grid/Grid_i.h b/TAO/examples/Persistent_Grid/Grid_i.h index 8598f2a4658..50bf997a2c5 100644 --- a/TAO/examples/Persistent_Grid/Grid_i.h +++ b/TAO/examples/Persistent_Grid/Grid_i.h @@ -43,15 +43,15 @@ public: virtual Grid_ptr make_grid (CORBA::Short, CORBA::Short - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This function creates and returns a <Grid>. - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Shutdown the server. - virtual void cleanup (TAO_ENV_SINGLE_ARG_DECL_NOT_USED ) + virtual void cleanup (ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)); // Do a clean up of the memory map @@ -98,40 +98,40 @@ public: ~Grid_i (void); // Destructor - virtual CORBA::Short width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual CORBA::Short width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns the width of the grid - virtual CORBA::Short height (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual CORBA::Short height (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns the height of the grid virtual void width (CORBA::Short - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Sets the width of the grid. virtual void height (CORBA::Short - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Sets the height of the grid. virtual void set (CORBA::Short, CORBA::Short, CORBA::Long - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, Grid::RANGE_ERROR)); // Sets the grid value. virtual CORBA::Long get (CORBA::Short, CORBA::Short - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, Grid::RANGE_ERROR)); // Gets the grid value. - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Destroy the grid. diff --git a/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp b/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp index 7aeb5702ea6..3eac4a3d7a2 100644 --- a/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp +++ b/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp @@ -58,14 +58,14 @@ Persistent_Client_i::run (const char *name, if (this->parse_args (argc, argv) == -1) return -1; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Make the Grid. Grid_ptr grid = client->make_grid (width_, height_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -78,7 +78,7 @@ Persistent_Client_i::run (const char *name, { CORBA::Long ret_val = grid->get (index_, ctr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -87,12 +87,12 @@ Persistent_Client_i::run (const char *name, } if (client.shutdown () == 1) { - client->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + client->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } if (this->remove_ == 1) { - client->cleanup (TAO_ENV_SINGLE_ARG_PARAMETER); + client->cleanup (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/examples/Persistent_Grid/Simple_util.cpp b/TAO/examples/Persistent_Grid/Simple_util.cpp index 50b9a858961..02eacbebccd 100644 --- a/TAO/examples/Persistent_Grid/Simple_util.cpp +++ b/TAO/examples/Persistent_Grid/Simple_util.cpp @@ -69,14 +69,14 @@ template <class Servant> int Server<Servant>::init (const char *servant_name, int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Call the init of <TAO_ORB_Manager> to initialize the ORB and // create a child POA under the root POA. if (this->orb_manager_.init_child_poa (argc, argv, "child_poa" - TAO_ENV_ARG_PARAMETER) == -1) + ACE_ENV_ARG_PARAMETER) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "init_child_poa"), @@ -109,7 +109,7 @@ Server<Servant>::init (const char *servant_name, CORBA::String_var str = this->orb_manager_.activate_under_child_poa (servant_name, &this->servant_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -138,10 +138,10 @@ Server<Servant>::init (const char *servant_name, } template <class Servant> int -Server<Servant>::run (TAO_ENV_SINGLE_ARG_DECL) +Server<Servant>::run (ACE_ENV_SINGLE_ARG_DECL) { // Run the main event loop for the ORB. - int ret = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER); + int ret = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (ret == -1) @@ -245,7 +245,7 @@ Client<InterfaceObj, Var>::init (const char * /*name*/, this->argc_ = argc; this->argv_ = argv; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -253,7 +253,7 @@ Client<InterfaceObj, Var>::init (const char * /*name*/, this->orb_ = CORBA::ORB_init (this->argc_, this->argv_, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse command line and verify parameters. @@ -263,7 +263,7 @@ Client<InterfaceObj, Var>::init (const char * /*name*/, if(this->ior_ != 0) { CORBA::Object_var server_object = - this->orb_->string_to_object (this->ior_ TAO_ENV_ARG_PARAMETER); + this->orb_->string_to_object (this->ior_ ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -273,7 +273,7 @@ Client<InterfaceObj, Var>::init (const char * /*name*/, this->ior_), -1); this->server_ = InterfaceObj::_narrow (server_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else diff --git a/TAO/examples/Persistent_Grid/Simple_util.h b/TAO/examples/Persistent_Grid/Simple_util.h index e95c2f3173c..f1491f00151 100644 --- a/TAO/examples/Persistent_Grid/Simple_util.h +++ b/TAO/examples/Persistent_Grid/Simple_util.h @@ -47,7 +47,7 @@ public: int init (const char *servant_name, int argc, char *argv[] - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize the Server state - parsing arguments and waiting. // interface_name is the name used to register the Servant. @@ -55,7 +55,7 @@ public: // After calling <init>, this method will register the server with // the TAO Naming Service using the servant_name passed to <init>. - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the orb. protected: @@ -120,7 +120,7 @@ public: void shutdown (int); // Fills in the shutdwon flag. - int obtain_initial_references (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + int obtain_initial_references (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); // Initialize naming service protected: diff --git a/TAO/examples/Persistent_Grid/server.cpp b/TAO/examples/Persistent_Grid/server.cpp index 76fa1e1d145..4a31cc0403e 100644 --- a/TAO/examples/Persistent_Grid/server.cpp +++ b/TAO/examples/Persistent_Grid/server.cpp @@ -13,18 +13,18 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "\n\tGrid server\n\n")); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { if (server.init ("Grid", argc, argv - TAO_ENV_ARG_PARAMETER) == -1) + ACE_ENV_ARG_PARAMETER) == -1) return 1; else { - server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp b/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp index 1200d20bd2d..e0d2194384f 100644 --- a/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp +++ b/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp @@ -37,7 +37,7 @@ UDP_Client_i::svc (void) client_name += "_"; client_name += pid; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -51,7 +51,7 @@ UDP_Client_i::svc (void) udp_->invoke (corba_client_name.in (), udpHandler_.inout (), i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -64,7 +64,7 @@ UDP_Client_i::svc (void) } // shut down remote ORB - udp_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + udp_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Time_Value tv (0, 500); // 50ms diff --git a/TAO/examples/PluggableUDP/tests/Basic/UDP_i.cpp b/TAO/examples/PluggableUDP/tests/Basic/UDP_i.cpp index 1027ecb86f8..2011f010dcc 100644 --- a/TAO/examples/PluggableUDP/tests/Basic/UDP_i.cpp +++ b/TAO/examples/PluggableUDP/tests/Basic/UDP_i.cpp @@ -30,7 +30,7 @@ void UDP_i::invoke (const char * client_name, UDP_ptr udpHandler, CORBA::Long request_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY @@ -62,7 +62,7 @@ UDP_i::invoke (const char * client_name, udpHandler->invoke (client_name, UDP::_nil (), request_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -78,7 +78,7 @@ UDP_i::invoke (const char * client_name, // Shutdown. void -UDP_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +UDP_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/examples/PluggableUDP/tests/Basic/UDP_i.h b/TAO/examples/PluggableUDP/tests/Basic/UDP_i.h index 4ed19a5aa01..3ed48cd85a2 100644 --- a/TAO/examples/PluggableUDP/tests/Basic/UDP_i.h +++ b/TAO/examples/PluggableUDP/tests/Basic/UDP_i.h @@ -47,10 +47,10 @@ public: virtual void invoke (const char *client_name, UDP_ptr udpHandler, CORBA::Long request_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Shutdown the server. diff --git a/TAO/examples/PluggableUDP/tests/Basic/client.cpp b/TAO/examples/PluggableUDP/tests/Basic/client.cpp index 90cd6bfcc2d..f7db9081cbd 100644 --- a/TAO/examples/PluggableUDP/tests/Basic/client.cpp +++ b/TAO/examples/PluggableUDP/tests/Basic/client.cpp @@ -79,18 +79,18 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { 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; if (parse_args (argc, argv) != 0) return 1; 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; UDP_var udp_var = - UDP::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + UDP::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (udp_var.in ())) @@ -102,7 +102,7 @@ main (int argc, char *argv[]) // Activate POA to handle the call back. 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 ())) @@ -111,14 +111,14 @@ 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; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Instantiate reply handler @@ -128,7 +128,7 @@ main (int argc, char *argv[]) udp_i.orb (orb.in ()); UDP_var udpHandler_var = - udp_i._this (TAO_ENV_SINGLE_ARG_PARAMETER); + udp_i._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Instantiate client @@ -143,17 +143,17 @@ main (int argc, char *argv[]) // ORB loop, will be shut down by our client thread - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, // ethernalize objects 0 // wait for completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; client->wait (); diff --git a/TAO/examples/PluggableUDP/tests/Basic/server.cpp b/TAO/examples/PluggableUDP/tests/Basic/server.cpp index 0397c8a3c7e..c550d02c525 100644 --- a/TAO/examples/PluggableUDP/tests/Basic/server.cpp +++ b/TAO/examples/PluggableUDP/tests/Basic/server.cpp @@ -66,11 +66,11 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { 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; 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 ())) @@ -79,11 +79,11 @@ 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; // Install a persistent POA in order to achieve a persistent IOR @@ -92,11 +92,11 @@ main (int argc, char *argv[]) policies.length (2); policies[0] = root_poa->create_lifespan_policy(PortableServer::PERSISTENT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policies[1] = root_poa->create_id_assignment_policy (PortableServer::USER_ID - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -104,13 +104,13 @@ main (int argc, char *argv[]) root_poa->create_POA("persistent", poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - policies[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - policies[1]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[1]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -125,25 +125,25 @@ main (int argc, char *argv[]) persistent_poa->activate_object_with_id (id.in (), &udp_i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj = persistent_poa->id_to_reference (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - UDP_var udp_var = UDP::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + UDP_var udp_var = UDP::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - // UDP_var udp_var = udp_i._this (TAO_ENV_SINGLE_ARG_PARAMETER); + // UDP_var udp_var = udp_i._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (udp_var.in ())) ACE_DEBUG ((LM_DEBUG, "Failed to narrow correct object reference.\n")); CORBA::String_var ior = - orb->object_to_string (udp_var.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (udp_var.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -161,7 +161,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; /* @@ -171,7 +171,7 @@ main (int argc, char *argv[]) udpHandler_i.orb (orb.in ()); UDP_var udpHandler_var = - udpHandler_i._this (TAO_ENV_SINGLE_ARG_PARAMETER); + udpHandler_i._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Instantiate client @@ -182,17 +182,17 @@ main (int argc, char *argv[]) client->activate (); */ - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, // ethernalize objects 0 // wait for completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; //delete client; diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp index 75639141928..f80fd02751a 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp +++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp @@ -48,11 +48,11 @@ UDP_PerformanceClient::svc () CORBA::String_var corba_client_name = CORBA::string_dup (client_name.c_str ()); - UDP_var udpHandler_var = udpHandler_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + UDP_var udpHandler_var = udpHandler_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; udp_->setResponseHandler (udpHandler_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_High_Res_Timer timer; @@ -71,7 +71,7 @@ UDP_PerformanceClient::svc () { udp_->invoke (corba_client_name.in (), j - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -93,7 +93,7 @@ UDP_PerformanceClient::svc () // Reset expected request ID udp_->reset (corba_client_name.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Give the reset a chance to propagate back to us @@ -155,7 +155,7 @@ UDP_PerformanceClient::svc () } // shut down remote ORB - udp_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + udp_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Time_Value tv (0, 50); // 50ms @@ -163,7 +163,7 @@ UDP_PerformanceClient::svc () // Shut down local ORB, trigger the end of the ORB event loop // in the main thread. - orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp index 409902492b7..025db630473 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp +++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp @@ -30,7 +30,7 @@ UDP_i::orb (CORBA::ORB_ptr orb) void UDP_i::setResponseHandler (UDP_ptr udpHandler - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { if (CORBA::is_nil (udpHandler)) @@ -43,7 +43,7 @@ UDP_i::setResponseHandler (UDP_ptr udpHandler void UDP_i::invoke (const char * client_name, CORBA::Long request_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY @@ -80,7 +80,7 @@ UDP_i::invoke (const char * client_name, { responseHandler_->invoke (client_name, request_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -96,7 +96,7 @@ UDP_i::invoke (const char * client_name, void UDP_i::reset (const char * client_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY @@ -109,7 +109,7 @@ UDP_i::reset (const char * client_name if (!CORBA::is_nil (responseHandler_.in ())) { responseHandler_->reset (client_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -124,7 +124,7 @@ UDP_i::reset (const char * client_name // Shutdown. void -UDP_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +UDP_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -134,7 +134,7 @@ UDP_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY { // Instruct the ORB to shutdown. - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.h b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.h index 292d4bff2bb..5d5d773ee25 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.h +++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.h @@ -39,20 +39,20 @@ public: // Destructor virtual void setResponseHandler (UDP_ptr udpHandler - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void invoke (const char *client_name, CORBA::Long request_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void reset (const char * client_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); // Shutdown the server. diff --git a/TAO/examples/PluggableUDP/tests/Performance/client.cpp b/TAO/examples/PluggableUDP/tests/Performance/client.cpp index 995ef1c8a14..07bb98914ee 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/client.cpp +++ b/TAO/examples/PluggableUDP/tests/Performance/client.cpp @@ -78,18 +78,18 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "PerformanceClient" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "PerformanceClient" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; 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; UDP_var udp_var = - UDP::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + UDP::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (udp_var.in ())) @@ -103,7 +103,7 @@ main (int argc, char *argv[]) // Activate POA to handle the call back. 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 ())) @@ -112,14 +112,14 @@ 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; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Instantiate reply handler @@ -129,7 +129,7 @@ main (int argc, char *argv[]) udp_i.orb (orb.in ()); UDP_var udpHandler_var = - udp_i._this (TAO_ENV_SINGLE_ARG_PARAMETER); + udp_i._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Instantiate client @@ -143,17 +143,17 @@ main (int argc, char *argv[]) client->activate (); // ORB loop, will be shut down by our client thread - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); // Fetch responses + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); // Fetch responses ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "ORB finished\n")); root_poa->destroy (1, // ethernalize objects 0 // wait for completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // it is save to delete the client, because the client was actually diff --git a/TAO/examples/PluggableUDP/tests/Performance/server.cpp b/TAO/examples/PluggableUDP/tests/Performance/server.cpp index e2ca027a6e2..594220abce1 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/server.cpp +++ b/TAO/examples/PluggableUDP/tests/Performance/server.cpp @@ -68,7 +68,7 @@ static void *svc (void *arg) ACE_TRY_NEW_ENV { - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -86,11 +86,11 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "PerformanceServer" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "PerformanceServer" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; 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 ())) @@ -99,11 +99,11 @@ 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; // Install a persistent POA in order to achieve a persistent IOR @@ -113,25 +113,25 @@ main (int argc, char *argv[]) policies.length (2); policies[0] = root_poa->create_lifespan_policy(PortableServer::PERSISTENT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policies[1] = root_poa->create_id_assignment_policy (PortableServer::USER_ID - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var persistent_poa = root_poa->create_POA("persistent", poa_manager.in (), policies - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - policies[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - policies[1]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[1]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -146,16 +146,16 @@ main (int argc, char *argv[]) persistent_poa->activate_object_with_id (id.in (), &udp_i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj = persistent_poa->id_to_reference (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - UDP_var udp_var = UDP::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + UDP_var udp_var = UDP::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (udp_var.in ())) @@ -163,7 +163,7 @@ main (int argc, char *argv[]) "Failed to narrow correct object reference.\n")); CORBA::String_var ior = - orb->object_to_string (udp_var.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (udp_var.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -181,7 +181,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; if (orb_threads > 1) @@ -189,17 +189,17 @@ main (int argc, char *argv[]) svc, orb.in ()); - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "ORB finished\n")); root_poa->destroy (1, // ethernalize objects 0 // wait for completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Thread_Manager::instance ()->wait (); diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp index 7358ff679cb..8ac9cf12210 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp @@ -69,15 +69,15 @@ int main (int argc, char *argv[]) CORBA::ORB_init (argc, argv, "ORB_Test_Client" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = - orb->string_to_object (iorFile TAO_ENV_ARG_PARAMETER); + orb->string_to_object (iorFile ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Simple_Server_var server = - Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -90,7 +90,7 @@ int main (int argc, char *argv[]) CORBA::String_var string = orb->object_to_string (server.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -103,7 +103,7 @@ int main (int argc, char *argv[]) //ACE_DEBUG ((LM_DEBUG, "threads finished\n")); - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -143,7 +143,7 @@ Client::svc (void) // This sets up the connector, so that we do not incur // the overhead on the first call in the loop. - server_->sendCharSeq (charSeq TAO_ENV_ARG_PARAMETER); + server_->sendCharSeq (charSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; timer.start (); @@ -153,10 +153,10 @@ Client::svc (void) { client_count++; - server_->sendCharSeq (charSeq TAO_ENV_ARG_PARAMETER); + server_->sendCharSeq (charSeq ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - //server_->sendOctetSeq (octetSeq TAO_ENV_ARG_PARAMETER); + //server_->sendOctetSeq (octetSeq ACE_ENV_ARG_PARAMETER); //ACE_DEBUG ((LM_DEBUG, ".")); } @@ -177,7 +177,7 @@ Client::svc (void) dur / this->niterations_, 1000000 / (dur / this->niterations_))); - server_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + server_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp index d8931bf0556..5c6e538d760 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp @@ -39,11 +39,11 @@ int main (int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "ORB_Test_Server" TAO_ENV_ARG_PARAMETER); + "ORB_Test_Server" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; 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 ())) @@ -52,26 +52,26 @@ int 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; Simple_Server_i server_impl (orb.in ()); - PortableServer::ObjectId_var oidServer = root_poa->activate_object (&server_impl TAO_ENV_ARG_PARAMETER); + PortableServer::ObjectId_var oidServer = root_poa->activate_object (&server_impl ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::Object_var objOne = root_poa->id_to_reference (oidServer.in () TAO_ENV_ARG_PARAMETER); + CORBA::Object_var objOne = root_poa->id_to_reference (oidServer.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - Simple_Server_var server = Simple_Server::_narrow (objOne.in () TAO_ENV_ARG_PARAMETER); + Simple_Server_var server = Simple_Server::_narrow (objOne.in () ACE_ENV_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 ())); @@ -89,18 +89,18 @@ int 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 (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp index fa6a8f0d36e..e9ad3018cc1 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp @@ -10,7 +10,7 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb) } void -Simple_Server_i::sendCharSeq (const Char_Seq & TAO_ENV_ARG_DECL_NOT_USED) +Simple_Server_i::sendCharSeq (const Char_Seq & ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Simple_Server_count++; @@ -18,7 +18,7 @@ Simple_Server_i::sendCharSeq (const Char_Seq & TAO_ENV_ARG_DECL_NOT_USED) } void -Simple_Server_i::sendOctetSeq (const Octet_Seq & TAO_ENV_ARG_DECL_NOT_USED) +Simple_Server_i::sendOctetSeq (const Octet_Seq & ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { Simple_Server_count++; @@ -27,7 +27,7 @@ Simple_Server_i::sendOctetSeq (const Octet_Seq & TAO_ENV_ARG_DECL_NOT_USED) CORBA::Long Simple_Server_i::get_number (CORBA::Long - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Long tmp = Simple_Server_count; @@ -36,14 +36,14 @@ Simple_Server_i::get_number (CORBA::Long } void -Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) +Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Simple_Server_i::shutdown\n")); ACE_TRY { - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.h b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.h index fe54f70163b..27dccfeb62d 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.h +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.h @@ -31,16 +31,16 @@ public: // ctor // = The Simple_Server methods. - void sendCharSeq (const Char_Seq & charSeq TAO_ENV_ARG_DECL_NOT_USED) + void sendCharSeq (const Char_Seq & charSeq ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void sendOctetSeq (const Octet_Seq & octetSeq TAO_ENV_ARG_DECL_NOT_USED) + void sendOctetSeq (const Octet_Seq & octetSeq ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Long get_number (CORBA::Long num TAO_ENV_ARG_DECL_NOT_USED) + CORBA::Long get_number (CORBA::Long num ACE_ENV_ARG_DECL_NOT_USED) 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/examples/Quoter/Factory_Finder.cpp b/TAO/examples/Quoter/Factory_Finder.cpp index cc164b10346..c7a76c7a97f 100644 --- a/TAO/examples/Quoter/Factory_Finder.cpp +++ b/TAO/examples/Quoter/Factory_Finder.cpp @@ -35,7 +35,7 @@ Quoter_Factory_Finder_Server::~Quoter_Factory_Finder_Server (void) factory_Finder_Name[0].id = CORBA::string_dup ("IDL_Quoter"); factory_Finder_Name[1].id = CORBA::string_dup ("Quoter_Factory_Finder"); if (this->quoterNamingContext_var_.ptr () != 0) - this->quoterNamingContext_var_->unbind (factory_Finder_Name TAO_ENV_ARG_PARAMETER); + this->quoterNamingContext_var_->unbind (factory_Finder_Name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -49,7 +49,7 @@ Quoter_Factory_Finder_Server::~Quoter_Factory_Finder_Server (void) int Quoter_Factory_Finder_Server::init (int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { const char *exception_message = "Null Message"; @@ -58,7 +58,7 @@ Quoter_Factory_Finder_Server::init (int argc, exception_message = "While ORB_Manager::init"; if (this->orb_manager_.init (argc, argv - TAO_ENV_ARG_PARAMETER) == -1) + ACE_ENV_ARG_PARAMETER) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "init"), @@ -67,7 +67,7 @@ Quoter_Factory_Finder_Server::init (int argc, // Activate the POA manager exception_message = "While activating the POA manager"; - int result = this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER); + int result = this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) @@ -88,7 +88,7 @@ Quoter_Factory_Finder_Server::init (int argc, exception_message = "Failure while activating the Quoter Factory Finder Impl"; CORBA::String_var str = this->orb_manager_.activate (this->quoter_Factory_Finder_i_ptr_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Print the IOR. @@ -102,7 +102,7 @@ Quoter_Factory_Finder_Server::init (int argc, // Get the Naming Service object reference. exception_message = "While resolving the Name Service"; CORBA::Object_var namingObj_var = - orb_manager_.orb()->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER); + orb_manager_.orb()->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (namingObj_var.in ())) @@ -113,7 +113,7 @@ Quoter_Factory_Finder_Server::init (int argc, exception_message = "While narrowing the Naming Context"; CosNaming::NamingContext_var namingContext_var = CosNaming::NamingContext::_narrow (namingObj_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the IDL_Quoter naming context. @@ -123,13 +123,13 @@ Quoter_Factory_Finder_Server::init (int argc, exception_message = "While resolving the Quoter Naming Context"; CORBA::Object_var quoterNamingObj_var = - namingContext_var->resolve (quoterContextName TAO_ENV_ARG_PARAMETER); + namingContext_var->resolve (quoterContextName ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; exception_message = "While narrowing the Quoter Naming Context"; quoterNamingContext_var_ = CosNaming::NamingContext::_narrow (quoterNamingObj_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->debug_level_ >= 2) @@ -143,13 +143,13 @@ Quoter_Factory_Finder_Server::init (int argc, quoter_Factory_Finder_Name_[0].id = CORBA::string_dup ("Quoter_Factory_Finder"); exception_message = "Factory_Factory::_this"; - CORBA::Object_var ff_obj = this->quoter_Factory_Finder_i_ptr_->_this(TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Object_var ff_obj = this->quoter_Factory_Finder_i_ptr_->_this(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; exception_message = "While binding the Factory Finder"; quoterNamingContext_var_->bind (quoter_Factory_Finder_Name_, ff_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->debug_level_ >= 2) @@ -168,13 +168,13 @@ Quoter_Factory_Finder_Server::init (int argc, } int -Quoter_Factory_Finder_Server::run (TAO_ENV_SINGLE_ARG_DECL) +Quoter_Factory_Finder_Server::run (ACE_ENV_SINGLE_ARG_DECL) { if (this->debug_level_ >= 1) ACE_DEBUG ((LM_DEBUG, "\nQuoter Example: Quoter_Factory_Finder_Server is running\n")); - orb_manager_.orb()->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb_manager_.orb()->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -223,14 +223,14 @@ main (int argc, char *argv []) ACE_TRY_NEW_ENV { - int result = quoter_Factory_Finder_Server.init (argc, argv TAO_ENV_ARG_PARAMETER); + int result = quoter_Factory_Finder_Server.init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) return 1; else { - quoter_Factory_Finder_Server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + quoter_Factory_Finder_Server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/examples/Quoter/Factory_Finder.h b/TAO/examples/Quoter/Factory_Finder.h index 44844e12947..3d9e89ca85d 100644 --- a/TAO/examples/Quoter/Factory_Finder.h +++ b/TAO/examples/Quoter/Factory_Finder.h @@ -37,10 +37,10 @@ public: ~Quoter_Factory_Finder_Server (void); // Destructor - int init (int argc, char *argv[] TAO_ENV_ARG_DECL); + int init (int argc, char *argv[] ACE_ENV_ARG_DECL); // Initialize the Quoter_Server state - parsing arguments and ... - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the orb u_int parse_args (void); diff --git a/TAO/examples/Quoter/Factory_Finder_i.cpp b/TAO/examples/Quoter/Factory_Finder_i.cpp index 023e2ec6c8d..9720df205c5 100644 --- a/TAO/examples/Quoter/Factory_Finder_i.cpp +++ b/TAO/examples/Quoter/Factory_Finder_i.cpp @@ -38,7 +38,7 @@ Quoter_Factory_Finder_i::~Quoter_Factory_Finder_i (void) CosLifeCycle::Factories * Quoter_Factory_Finder_i::find_factories (const CosLifeCycle::Key &factory_key - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosLifeCycle::NoFactory)) { @@ -54,7 +54,7 @@ Quoter_Factory_Finder_i::find_factories (const CosLifeCycle::Key &factory_key // Get the Naming Service object reference. exception_message = "While resolving the Name Service"; CORBA::Object_var namingObj_var = - orb_ptr->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER); + orb_ptr->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (namingObj_var.in ())) @@ -65,7 +65,7 @@ Quoter_Factory_Finder_i::find_factories (const CosLifeCycle::Key &factory_key exception_message = "While narrowing the Naming Context"; CosNaming::NamingContext_var namingContext_var = CosNaming::NamingContext::_narrow (namingObj_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Take the key supplied to search for a Quoter Factory @@ -74,7 +74,7 @@ Quoter_Factory_Finder_i::find_factories (const CosLifeCycle::Key &factory_key // Try to get a reference to a Quoter Factory exception_message = "While resolving the Factory Object"; CORBA::Object_var quoterFactoryObject_var = - namingContext_var->resolve (factoryName TAO_ENV_ARG_PARAMETER); + namingContext_var->resolve (factoryName ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Check if it is a valid Quoter Factory reference diff --git a/TAO/examples/Quoter/Factory_Finder_i.h b/TAO/examples/Quoter/Factory_Finder_i.h index 8d7beeea56c..97695c7c9b2 100644 --- a/TAO/examples/Quoter/Factory_Finder_i.h +++ b/TAO/examples/Quoter/Factory_Finder_i.h @@ -29,7 +29,7 @@ public: ~Quoter_Factory_Finder_i (void); virtual CosLifeCycle::Factories * find_factories (const CosLifeCycle::Key &factory_key - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosLifeCycle::NoFactory)); // Returns a sequence of Factories if factories matching the diff --git a/TAO/examples/Quoter/Generic_Factory.cpp b/TAO/examples/Quoter/Generic_Factory.cpp index f4329dbf36d..acb7858daf1 100644 --- a/TAO/examples/Quoter/Generic_Factory.cpp +++ b/TAO/examples/Quoter/Generic_Factory.cpp @@ -35,7 +35,7 @@ Quoter_Generic_Factory_Server::~Quoter_Generic_Factory_Server (void) generic_Factory_Name[0].id = CORBA::string_dup ("IDL_Quoter"); generic_Factory_Name[1].id = CORBA::string_dup ("Quoter_Generic_Factory"); if (this->quoterNamingContext_var_.ptr () != 0) - this->quoterNamingContext_var_->unbind (generic_Factory_Name TAO_ENV_ARG_PARAMETER); + this->quoterNamingContext_var_->unbind (generic_Factory_Name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) @@ -52,7 +52,7 @@ Quoter_Generic_Factory_Server::~Quoter_Generic_Factory_Server (void) int Quoter_Generic_Factory_Server::init (int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { const char *exception_message = "Null Message"; @@ -61,7 +61,7 @@ Quoter_Generic_Factory_Server::init (int argc, int result = 0; // Initialize the ORB Manager exception_message = "While initing the orb_manager"; - result = this->orb_manager_.init (argc, argv TAO_ENV_ARG_PARAMETER); + result = this->orb_manager_.init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) @@ -69,7 +69,7 @@ Quoter_Generic_Factory_Server::init (int argc, // Activate the POA manager exception_message = "While activating the POA manager"; - result = this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER); + result = this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) @@ -88,7 +88,7 @@ Quoter_Generic_Factory_Server::init (int argc, exception_message = "While activating the Generic Factory"; CORBA::String_var str = this->orb_manager_.activate (this->quoter_Generic_Factory_i_ptr_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Print the IOR. @@ -103,7 +103,7 @@ Quoter_Generic_Factory_Server::init (int argc, // Get the Naming Service object reference. exception_message = "While getting the Naming Service Reference"; CORBA::Object_var namingObj_var = - orb_manager_.orb()->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER); + orb_manager_.orb()->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (namingObj_var.in ())) @@ -114,7 +114,7 @@ Quoter_Generic_Factory_Server::init (int argc, exception_message = "While narrowing the Naming Context"; CosNaming::NamingContext_var namingContext_var = CosNaming::NamingContext::_narrow (namingObj_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (namingContext_var.in ())) @@ -134,13 +134,13 @@ Quoter_Generic_Factory_Server::init (int argc, exception_message = "While resolving the Quoter"; CORBA::Object_var quoterNamingObj_var = namingContext_var->resolve (quoterContextName - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; exception_message = "While narrowing the Quoter"; quoterNamingContext_var_ = CosNaming::NamingContext::_narrow (quoterNamingObj_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->debug_level_ >= 2) @@ -154,13 +154,13 @@ Quoter_Generic_Factory_Server::init (int argc, quoter_Generic_Factory_Name[0].id = CORBA::string_dup ("Quoter_Generic_Factory"); exception_message = "Generic_Factory::_this"; - CORBA::Object_var gf_obj = this->quoter_Generic_Factory_i_ptr_->_this(TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Object_var gf_obj = this->quoter_Generic_Factory_i_ptr_->_this(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; exception_message = "While binding the Generic Factory"; quoterNamingContext_var_->bind (quoter_Generic_Factory_Name, gf_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->debug_level_ >= 2) @@ -181,20 +181,20 @@ Quoter_Generic_Factory_Server::init (int argc, exception_message = "While resolving the Life Cycle Service"; CORBA::Object_var life_Cycle_Service_Obj_var = namingContext_var->resolve (life_Cycle_Service_Name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; exception_message = "While narrowing the Life Cycle Service"; LifeCycleService::Life_Cycle_Service_var life_Cycle_Service_var = LifeCycleService::Life_Cycle_Service::_narrow (life_Cycle_Service_Obj_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->debug_level_ >= 2) ACE_DEBUG ((LM_DEBUG, "Generic_Factory: Have a proper reference to Life Cycle Service.\n")); exception_message = "While _this on Generic Factory"; - CORBA::Object_var object_var = this->quoter_Generic_Factory_i_ptr_->_this(TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Object_var object_var = this->quoter_Generic_Factory_i_ptr_->_this(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; exception_message = "While registering the generic factory"; @@ -202,7 +202,7 @@ Quoter_Generic_Factory_Server::init (int argc, "Bryan 503", // location "Generic Factory", // description object_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->debug_level_ >= 2) @@ -224,13 +224,13 @@ Quoter_Generic_Factory_Server::init (int argc, } int -Quoter_Generic_Factory_Server::run (TAO_ENV_SINGLE_ARG_DECL) +Quoter_Generic_Factory_Server::run (ACE_ENV_SINGLE_ARG_DECL) { if (this->debug_level_ >= 1) ACE_DEBUG ((LM_DEBUG, "\nQuoter Example: Quoter_Generic_Factory_Server is running\n")); - orb_manager_.orb()->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb_manager_.orb()->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -284,11 +284,11 @@ main (int argc, char *argv []) { if (quoter_Generic_Factory_Server.init (argc, argv - TAO_ENV_ARG_PARAMETER) == -1) + ACE_ENV_ARG_PARAMETER) == -1) return 1; else { - quoter_Generic_Factory_Server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + quoter_Generic_Factory_Server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/examples/Quoter/Generic_Factory.h b/TAO/examples/Quoter/Generic_Factory.h index 0c1de6c0cd5..1d5950ebb27 100644 --- a/TAO/examples/Quoter/Generic_Factory.h +++ b/TAO/examples/Quoter/Generic_Factory.h @@ -39,10 +39,10 @@ public: int init (int argc, char *argv[] - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize the Quoter_Server state - parsing arguments and ... - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the orb. u_int parse_args (void); diff --git a/TAO/examples/Quoter/Generic_Factory_i.cpp b/TAO/examples/Quoter/Generic_Factory_i.cpp index d22e7ee8e87..bf8002d1ff4 100644 --- a/TAO/examples/Quoter/Generic_Factory_i.cpp +++ b/TAO/examples/Quoter/Generic_Factory_i.cpp @@ -34,7 +34,7 @@ Quoter_Generic_Factory_i::~Quoter_Generic_Factory_i (void) CORBA::Boolean Quoter_Generic_Factory_i::supports (const CosLifeCycle::Key & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; @@ -44,7 +44,7 @@ Quoter_Generic_Factory_i::supports (const CosLifeCycle::Key & CosNaming::NamingContext_ptr Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_key - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CosNaming::NamingContext_var quoterNamingContext_var; ACE_TRY @@ -55,7 +55,7 @@ Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_k // Get the Naming Service object reference. CORBA::Object_var namingObj_var = - orb_ptr->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER); + orb_ptr->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (namingObj_var.in ())) @@ -65,7 +65,7 @@ Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_k // Narrow the object reference to a Naming Context. CosNaming::NamingContext_var namingContext_var = CosNaming::NamingContext::_narrow (namingObj_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosNaming::Name quoterContextName (1); // max = 1 @@ -74,12 +74,12 @@ Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_k // Get the IDL_Quoter naming context. CORBA::Object_var quoterNamingObj_var = - namingContext_var->resolve (quoterContextName TAO_ENV_ARG_PARAMETER); + namingContext_var->resolve (quoterContextName ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; quoterNamingContext_var = CosNaming::NamingContext::_narrow (quoterNamingObj_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -96,7 +96,7 @@ Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_k CORBA::Object_ptr Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key, const CosLifeCycle::Criteria & - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosLifeCycle::NoFactory, CosLifeCycle::InvalidCriteria, @@ -107,7 +107,7 @@ Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key, { CosNaming::NamingContext_var quoterNamingContext_var = this->get_naming_context (factory_key - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // ** now a proper reference to the quoter naming context is @@ -119,7 +119,7 @@ Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key, // Try to get a reference to a Quoter Factory CORBA::Object_var quoterFactoryObject_var = - quoterNamingContext_var->resolve (factory_Name TAO_ENV_ARG_PARAMETER); + quoterNamingContext_var->resolve (factory_Name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // We were able to get a reference to Quoter Factory. @@ -131,7 +131,7 @@ Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key, Stock::Quoter_Factory_var factory_var = Stock::Quoter_Factory::_narrow (quoterFactoryObject_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (factory_var.in ())) @@ -147,7 +147,7 @@ Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key, // Now retrieve the Quoter obj ref corresponding to the key. quoter_var = factory_var->create_quoter ("test" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->debug_level_ > 1) diff --git a/TAO/examples/Quoter/Generic_Factory_i.h b/TAO/examples/Quoter/Generic_Factory_i.h index e0477100101..b03ee673647 100644 --- a/TAO/examples/Quoter/Generic_Factory_i.h +++ b/TAO/examples/Quoter/Generic_Factory_i.h @@ -30,14 +30,14 @@ public: ~Quoter_Generic_Factory_i (void); CORBA::Boolean supports (const CosLifeCycle::Key &factory_key - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns true if the Generic Factory is able to forward a request // for creating an object described by the <factory_key>. CORBA::Object_ptr create_object (const CosLifeCycle::Key &factory_key, const CosLifeCycle::Criteria &the_criteria - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosLifeCycle::NoFactory, CosLifeCycle::InvalidCriteria, @@ -48,7 +48,7 @@ public: private: CosNaming::NamingContext_ptr get_naming_context (const CosLifeCycle::Key &factory_key - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // a helper to get the proper naming context. int debug_level_; diff --git a/TAO/examples/Quoter/Quoter_i.cpp b/TAO/examples/Quoter/Quoter_i.cpp index d24ba43056e..1b9d5a93819 100644 --- a/TAO/examples/Quoter/Quoter_i.cpp +++ b/TAO/examples/Quoter/Quoter_i.cpp @@ -45,7 +45,7 @@ Quoter_Factory_i::~Quoter_Factory_i (void) // Initialize everything in the factory -int Quoter_Factory_i::init (TAO_ENV_SINGLE_ARG_DECL) +int Quoter_Factory_i::init (ACE_ENV_SINGLE_ARG_DECL) { ACE_NEW_RETURN (this->my_quoters_, Quoter_i *[this->quoter_num_], @@ -62,18 +62,18 @@ int Quoter_Factory_i::init (TAO_ENV_SINGLE_ARG_DECL) const char *location_string = "POA::activate"; ACE_TRY { - this->poa_ptr_->activate_object (this->my_quoters_[i] TAO_ENV_ARG_PARAMETER); + this->poa_ptr_->activate_object (this->my_quoters_[i] ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; location_string = "_this"; - Stock::Quoter_var quoter_var = this->my_quoters_[i]->_this(TAO_ENV_SINGLE_ARG_PARAMETER); + Stock::Quoter_var quoter_var = this->my_quoters_[i]->_this(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; location_string = "CORBA::ORB::object_to_string"; // Stringify the object reference and print it out. CORBA::String_var quoter_ior = TAO_ORB_Core_instance()->orb()->object_to_string (quoter_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -93,7 +93,7 @@ int Quoter_Factory_i::init (TAO_ENV_SINGLE_ARG_DECL) Stock::Quoter_ptr Quoter_Factory_i::create_quoter (const char * - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Stock::Invalid_Quoter)) { @@ -102,7 +102,7 @@ Quoter_Factory_i::create_quoter (const char * if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Quoter %d Created\n", this->next_quoter_)); - return my_quoters_[this->next_quoter_]->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + return my_quoters_[this->next_quoter_]->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } @@ -131,7 +131,7 @@ Quoter_i::~Quoter_i (void) CORBA::Long Quoter_i::get_quote (char const * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, Stock::Invalid_Stock, Stock::Invalid_Quoter)) @@ -145,7 +145,7 @@ Quoter_i::get_quote (char const * CosLifeCycle::LifeCycleObject_ptr Quoter_i::copy (CosLifeCycle::FactoryFinder_ptr there, const CosLifeCycle::Criteria &/*the_criteria*/ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosLifeCycle::NoFactory, CosLifeCycle::NotCopyable, @@ -177,7 +177,7 @@ CosLifeCycle::LifeCycleObject::_nil (); // Find an appropriate factory over there. exception_message = "While trying to find a factory.\n"; CosLifeCycle::Factories *factories_ptr = - there->find_factories (factoryKey TAO_ENV_ARG_PARAMETER); + there->find_factories (factoryKey ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Now it is known that there is at least one factory. @@ -192,7 +192,7 @@ CosLifeCycle::LifeCycleObject::_nil (); exception_message = "While narrowing.\n"; CosLifeCycle::GenericFactory_var generic_Factory_var = CosLifeCycle::GenericFactory::_narrow (generic_FactoryObj_ptr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (generic_Factory_var.in ())) @@ -215,11 +215,11 @@ CosLifeCycle::LifeCycleObject::_nil (); CORBA::Object_var quoterObject_var = generic_Factory_var->create_object (genericFactoryName, criteria - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; exception_message = "While narrowing object"; - quoter_var = Stock::Quoter::_narrow (quoterObject_var.in() TAO_ENV_ARG_PARAMETER); + quoter_var = Stock::Quoter::_narrow (quoterObject_var.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (quoter_var.in ())) @@ -272,7 +272,7 @@ CosLifeCycle::LifeCycleObject::_nil (); void Quoter_i::move (CosLifeCycle::FactoryFinder_ptr /* there */, const CosLifeCycle::Criteria & /* the_criteria */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosLifeCycle::NoFactory, CosLifeCycle::NotMovable, @@ -289,7 +289,7 @@ Quoter_i::move (CosLifeCycle::FactoryFinder_ptr /* there */, // Removes the object. Once we shut down the ORB we can call it a day. void -Quoter_i::remove (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Quoter_i::remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, CosLifeCycle::NotRemovable)) { diff --git a/TAO/examples/Quoter/Quoter_i.h b/TAO/examples/Quoter/Quoter_i.h index 6408ad5f0bc..b7e1e2b7e5f 100644 --- a/TAO/examples/Quoter/Quoter_i.h +++ b/TAO/examples/Quoter/Quoter_i.h @@ -44,7 +44,7 @@ public: // Destructor virtual CORBA::Long get_quote (const char *stock_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Stock::Invalid_Stock, Stock::Invalid_Quoter)); @@ -54,7 +54,7 @@ public: virtual CosLifeCycle::LifeCycleObject_ptr copy (CosLifeCycle::FactoryFinder_ptr there, const CosLifeCycle::Criteria &the_criteria - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosLifeCycle::NoFactory, CosLifeCycle::NotCopyable, @@ -64,7 +64,7 @@ public: virtual void move (CosLifeCycle::FactoryFinder_ptr there, const CosLifeCycle::Criteria &the_criteria - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosLifeCycle::NoFactory, CosLifeCycle::NotMovable, @@ -72,7 +72,7 @@ public: CosLifeCycle::CannotMeetCriteria)); // Move this object using <there> - virtual void remove (TAO_ENV_SINGLE_ARG_DECL) + virtual void remove (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosLifeCycle::NotRemovable)); // Removes the object. @@ -105,11 +105,11 @@ public: ~Quoter_Factory_i (void); // Destructor. - int init (TAO_ENV_SINGLE_ARG_DECL); + int init (ACE_ENV_SINGLE_ARG_DECL); // Initialize everything in the factory virtual Stock::Quoter_ptr create_quoter (const char *name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Stock::Invalid_Quoter)); // Return the quoter by the id <name>. diff --git a/TAO/examples/Quoter/client.cpp b/TAO/examples/Quoter/client.cpp index c5f8aaad712..a685c33fdeb 100644 --- a/TAO/examples/Quoter/client.cpp +++ b/TAO/examples/Quoter/client.cpp @@ -89,7 +89,7 @@ Quoter_Client::run (void) ACE_TRY_NEW_ENV { exception_message = "While using get_quote ()"; - CORBA::Long q = this->quoter_var_->get_quote ("ACE Hardware" TAO_ENV_ARG_PARAMETER); + CORBA::Long q = this->quoter_var_->get_quote ("ACE Hardware" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->debug_level_ >= 1) @@ -102,7 +102,7 @@ Quoter_Client::run (void) CORBA::Object_var quoterObj_var = this->quoter_var_->copy (factory_Finder_var_.in (), criteria - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (quoterObj_var.in())) @@ -114,7 +114,7 @@ Quoter_Client::run (void) exception_message = "While narrowing the quoter"; Stock::Quoter_var copied_quoter_var = Stock::Quoter::_narrow (quoterObj_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (copied_quoter_var.in())) @@ -126,7 +126,7 @@ Quoter_Client::run (void) ACE_DEBUG ((LM_DEBUG, "Quoter Client: Copied object.\n")); exception_message = "While using get_quote () on copied object"; - q = copied_quoter_var->get_quote ("ACE Hardware" TAO_ENV_ARG_PARAMETER); + q = copied_quoter_var->get_quote ("ACE Hardware" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->debug_level_ >= 1) @@ -163,7 +163,7 @@ Quoter_Client::init_naming_service (void) { // Resolve the Naming Service CORBA::Object_var naming_obj = - orb_->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER); + orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (naming_obj.in ())) @@ -173,7 +173,7 @@ Quoter_Client::init_naming_service (void) exception_message = "While narrowing the naming context"; CosNaming::NamingContext_var naming_context = - CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER); + CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->debug_level_ >= 2) @@ -190,7 +190,7 @@ Quoter_Client::init_naming_service (void) exception_message = "While resolving the factory finder"; CORBA::Object_var factory_obj = naming_context->resolve (quoterFactoryFinderName - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->debug_level_ >= 2) @@ -199,7 +199,7 @@ Quoter_Client::init_naming_service (void) exception_message = "While narrowing the factory finder"; factory_Finder_var_ = Stock::Quoter_Factory_Finder::_narrow (factory_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (factory_Finder_var_.in ())) @@ -233,7 +233,7 @@ Quoter_Client::init_naming_service (void) // Find an appropriate factory over there. exception_message = "While finding factories"; CosLifeCycle::Factories *factories_ptr = - factory_Finder_var_->find_factories (factoryName TAO_ENV_ARG_PARAMETER); + factory_Finder_var_->find_factories (factoryName ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (factories_ptr == 0) @@ -263,7 +263,7 @@ Quoter_Client::init_naming_service (void) exception_message = "While narrowing the factory"; generic_Factory_var_ = CosLifeCycle::GenericFactory::_narrow (quoter_FactoryObj_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (this->generic_Factory_var_.in ())) @@ -308,7 +308,7 @@ Quoter_Client::init (int argc, char **argv) this->orb_ = CORBA::ORB_init (this->argc_, this->argv_, "internet" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse command line and verify parameters. @@ -338,10 +338,10 @@ Quoter_Client::init (int argc, char **argv) CORBA::Object_var quoterObject_var = this->generic_Factory_var_->create_object (genericFactoryName, criteria - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->quoter_var_ = Stock::Quoter::_narrow (quoterObject_var.in() TAO_ENV_ARG_PARAMETER); + this->quoter_var_ = Stock::Quoter::_narrow (quoterObject_var.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->debug_level_ >= 2) diff --git a/TAO/examples/Quoter/server.cpp b/TAO/examples/Quoter/server.cpp index f0c7b9680ca..d2dfcd160bd 100644 --- a/TAO/examples/Quoter/server.cpp +++ b/TAO/examples/Quoter/server.cpp @@ -62,13 +62,13 @@ Quoter_Server::parse_args (void) int Quoter_Server::init (int argc, char* argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { const char *exception_message = "Null Message"; ACE_TRY { exception_message = "While ORB Manager init"; - int result = this->orb_manager_.init (argc, argv TAO_ENV_ARG_PARAMETER); + int result = this->orb_manager_.init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) @@ -91,19 +91,19 @@ Quoter_Server::init (int argc, // Obtain the RootPOA. CORBA::Object_var obj = - this->orb_manager_.orb()->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + this->orb_manager_.orb()->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POA_var object from Object_var. exception_message = "While narrowing the root pos"; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the POAManager of the RootPOA. exception_message = "While getting the POA Manager"; 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; ACE_NEW_RETURN (quoter_Factory_i_ptr_, @@ -112,7 +112,7 @@ Quoter_Server::init (int argc, 0); exception_message = "While initing the quoter factory"; - quoter_Factory_i_ptr_->init (TAO_ENV_SINGLE_ARG_PARAMETER); + quoter_Factory_i_ptr_->init (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var quoter_Factory_oid = @@ -121,22 +121,22 @@ Quoter_Server::init (int argc, exception_message = "While activating quoter factory"; root_poa->activate_object_with_id (quoter_Factory_oid.in (), quoter_Factory_i_ptr_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get Object reference for first_foo_impl object. exception_message = "While quoter_Factor::_this"; - Stock::Quoter_Factory_var quoter_Factory_var = quoter_Factory_i_ptr_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + Stock::Quoter_Factory_var quoter_Factory_var = quoter_Factory_i_ptr_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Stringify the object reference and print it out. exception_message = "While object_to_string"; CORBA::String_var quoter_Factory_ior = - this->orb_manager_.orb()->object_to_string (quoter_Factory_var.in () TAO_ENV_ARG_PARAMETER); + this->orb_manager_.orb()->object_to_string (quoter_Factory_var.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; exception_message = "While activating the POA Manager"; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Print the IOR. @@ -151,7 +151,7 @@ Quoter_Server::init (int argc, } ACE_ENDTRY; - return this->init_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->init_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER); } @@ -159,7 +159,7 @@ Quoter_Server::init (int argc, // and Quoter_factory object. int -Quoter_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) +Quoter_Server::init_naming_service (ACE_ENV_SINGLE_ARG_DECL) { const char *exception_message = "Null Message"; ACE_TRY @@ -167,7 +167,7 @@ Quoter_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) CORBA::ORB_ptr orb_ptr = TAO_ORB_Core_instance()->orb(); CORBA::Object_var naming_obj = - orb_ptr->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER); + orb_ptr->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (naming_obj.in ())) @@ -177,7 +177,7 @@ Quoter_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) exception_message = "While narrowing naming context"; namingContext_var_ = - CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER); + CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosNaming::Name quoterContextName (1); @@ -186,7 +186,7 @@ Quoter_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) exception_message = "While binding a new context"; CosNaming::NamingContext_var quoterNameContext = - namingContext_var_->bind_new_context (quoterContextName TAO_ENV_ARG_PARAMETER); + namingContext_var_->bind_new_context (quoterContextName ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; //Register the quoter_factory name with the IDL_quoter Naming @@ -196,13 +196,13 @@ Quoter_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) quoterFactoryContextName[0].id = CORBA::string_dup ("Quoter_Factory"); exception_message = "While using factory _this"; - Stock::Quoter_Factory_var quoter_factory_var = quoter_Factory_i_ptr_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + Stock::Quoter_Factory_var quoter_factory_var = quoter_Factory_i_ptr_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; exception_message = "While binding factory"; quoterNameContext->bind (quoterFactoryContextName, quoter_factory_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -217,13 +217,13 @@ Quoter_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL) } int -Quoter_Server::run (TAO_ENV_SINGLE_ARG_DECL) +Quoter_Server::run (ACE_ENV_SINGLE_ARG_DECL) { if (this->debug_level_ >= 1) ACE_DEBUG ((LM_DEBUG, "\nQuoter Example: Quoter_Server is running\n")); - orb_manager_.orb()->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb_manager_.orb()->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; @@ -239,12 +239,12 @@ Quoter_Server::~Quoter_Server (void) factory_name[0].id = CORBA::string_dup ("IDL_Quoter"); factory_name[1].id = CORBA::string_dup ("Quoter_Factory"); if (this->namingContext_var_.ptr () != 0) - this->namingContext_var_->unbind (factory_name TAO_ENV_ARG_PARAMETER); + this->namingContext_var_->unbind (factory_name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; factory_name.length (1); if (this->namingContext_var_.ptr () != 0) - this->namingContext_var_->unbind (factory_name TAO_ENV_ARG_PARAMETER); + this->namingContext_var_->unbind (factory_name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -265,13 +265,13 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { - int result = quoter_server.init (argc, argv TAO_ENV_ARG_PARAMETER); + int result = quoter_server.init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (result == -1) return 1; - quoter_server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + quoter_server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) diff --git a/TAO/examples/Quoter/server.h b/TAO/examples/Quoter/server.h index b3b238981b0..fe681790c66 100644 --- a/TAO/examples/Quoter/server.h +++ b/TAO/examples/Quoter/server.h @@ -52,17 +52,17 @@ public: ~Quoter_Server (void); // Destructor - int init (int argc, char *argv[] TAO_ENV_ARG_DECL); + int init (int argc, char *argv[] ACE_ENV_ARG_DECL); // Initialize the Quoter_Server state - parsing arguments and ... - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the server. private: int parse_args (void); // Parses the commandline arguments. - int init_naming_service (TAO_ENV_SINGLE_ARG_DECL); + int init_naming_service (ACE_ENV_SINGLE_ARG_DECL); // Initializes the name server and registers cubit factory with the // name server. diff --git a/TAO/examples/RTCORBA/Activity/Activity.cpp b/TAO/examples/RTCORBA/Activity/Activity.cpp index b24c3cb9360..1d9a3966392 100644 --- a/TAO/examples/RTCORBA/Activity/Activity.cpp +++ b/TAO/examples/RTCORBA/Activity/Activity.cpp @@ -67,63 +67,63 @@ Activity::current (void) int Activity::init (int& argc, char *argv [] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->orb_ = CORBA::ORB_init (argc, argv, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->init_sched (); CORBA::Object_var object = orb_->resolve_initial_references ("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); root_poa_ = PortableServer::POA::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); PortableServer::POAManager_var poa_manager = - root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); object = orb_->resolve_initial_references ("RTORB" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->rt_orb_ = RTCORBA::RTORB::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); object = orb_->resolve_initial_references ("RTCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); current_ = RTCORBA::Current::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; } int -Activity::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL) +Activity::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL) { CORBA::Object_var naming_obj = this->orb_->resolve_initial_references ("NameService" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Need to check return value for errors. @@ -134,7 +134,7 @@ Activity::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL) this->naming_ = CosNaming::NamingContextExt::_narrow (naming_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); //@@tmp hack, otherwise crashes on exit!..?? @@ -143,7 +143,7 @@ Activity::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL) } void -Activity::activate_poa_list (TAO_ENV_SINGLE_ARG_DECL) +Activity::activate_poa_list (ACE_ENV_SINGLE_ARG_DECL) { POA_LIST list; int count = builder_->poa_list (list); @@ -151,13 +151,13 @@ Activity::activate_poa_list (TAO_ENV_SINGLE_ARG_DECL) for (int i = 0; i < count; ++i) { list[i]->activate (this->rt_orb_.in(), this->root_poa_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } void -Activity::activate_job_list (TAO_ENV_SINGLE_ARG_DECL) +Activity::activate_job_list (ACE_ENV_SINGLE_ARG_DECL) { JOB_LIST list; int count = builder_->job_list (list); @@ -173,7 +173,7 @@ Activity::activate_job_list (TAO_ENV_SINGLE_ARG_DECL) // find your poa PortableServer::POA_var host_poa = root_poa_->find_POA (job->poa ().c_str (), 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::ServantBase_var servant_var (job); @@ -182,29 +182,29 @@ Activity::activate_job_list (TAO_ENV_SINGLE_ARG_DECL) PortableServer::ObjectId_var id; id = host_poa->activate_object (job - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Object_var server = host_poa->id_to_reference (id.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var ior = orb_->object_to_string (server.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; const ACE_CString &job_name = job->name (); CosNaming::Name_var name = this->naming_->to_name (job_name.c_str () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->naming_->rebind (name.in (), server.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -217,7 +217,7 @@ Activity::activate_job_list (TAO_ENV_SINGLE_ARG_DECL) } void -Activity::activate_schedule (TAO_ENV_SINGLE_ARG_DECL) +Activity::activate_schedule (ACE_ENV_SINGLE_ARG_DECL) { TASK_LIST list; int count = builder_->task_list (list); @@ -240,10 +240,10 @@ Activity::activate_schedule (TAO_ENV_SINGLE_ARG_DECL) name[0].id = CORBA::string_dup (task->job ()); CORBA::Object_var obj = - this->naming_->resolve (name TAO_ENV_ARG_PARAMETER); + this->naming_->resolve (name ACE_ENV_ARG_PARAMETER); ACE_CHECK; - Job_var job = Job::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); + Job_var job = Job::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (TAO_debug_level > 0) @@ -252,12 +252,12 @@ Activity::activate_schedule (TAO_ENV_SINGLE_ARG_DECL) // PriorityModelPolicy. CORBA::Policy_var policy = job->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; RTCORBA::PriorityModelPolicy_var priority_policy = RTCORBA::PriorityModelPolicy::_narrow (policy.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (priority_policy.in ())) @@ -266,7 +266,7 @@ Activity::activate_schedule (TAO_ENV_SINGLE_ARG_DECL) else { RTCORBA::PriorityModel priority_model = - priority_policy->priority_model (TAO_ENV_SINGLE_ARG_PARAMETER); + priority_policy->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (priority_model == RTCORBA::CLIENT_PROPAGATED) @@ -341,28 +341,28 @@ Activity::check_ifexit (void) CORBA::Short Activity::get_server_priority (CORBA::Object_ptr server - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Get the Priority Model Policy from the stub. CORBA::Policy_var policy = server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Narrow down to correct type. RTCORBA::PriorityModelPolicy_var priority_policy = - RTCORBA::PriorityModelPolicy::_narrow (policy.in () TAO_ENV_ARG_PARAMETER); + RTCORBA::PriorityModelPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Make sure that we have the SERVER_DECLARED priority model. RTCORBA::PriorityModel priority_model = - priority_policy->priority_model (TAO_ENV_SINGLE_ARG_PARAMETER); + priority_policy->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (priority_model != RTCORBA::SERVER_DECLARED) return -1; // Return the server priority. - return priority_policy->server_priority (TAO_ENV_SINGLE_ARG_PARAMETER); + return priority_policy->server_priority (ACE_ENV_SINGLE_ARG_PARAMETER); } int @@ -429,25 +429,25 @@ Activity::init_sched (void) } void -Activity::run (int argc, char *argv[] TAO_ENV_ARG_DECL) +Activity::run (int argc, char *argv[] ACE_ENV_ARG_DECL) { - this->init (argc, argv TAO_ENV_ARG_PARAMETER); + this->init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_CHECK; - if (this->resolve_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER) == -1) + if (this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER) == -1) return; ACE_CHECK; - this->activate_poa_list (TAO_ENV_SINGLE_ARG_PARAMETER); + this->activate_poa_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->activate_job_list (TAO_ENV_SINGLE_ARG_PARAMETER); + this->activate_job_list (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->activate_schedule (TAO_ENV_SINGLE_ARG_PARAMETER); + this->activate_schedule (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; orb_->destroy (); @@ -467,7 +467,7 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { - ACTIVITY::instance()->run (argc, argv TAO_ENV_ARG_PARAMETER); + ACTIVITY::instance()->run (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/RTCORBA/Activity/Activity.h b/TAO/examples/RTCORBA/Activity/Activity.h index 04e8827f948..a449a9d016d 100644 --- a/TAO/examples/RTCORBA/Activity/Activity.h +++ b/TAO/examples/RTCORBA/Activity/Activity.h @@ -43,14 +43,14 @@ private: public: /// initialize the ORB et. al. - int init (int& argc, char *argv [] TAO_ENV_ARG_DECL); + int init (int& argc, char *argv [] ACE_ENV_ARG_DECL); /// Activate the tasks, jobs, poas. - void run (int argc, char *argv[] TAO_ENV_ARG_DECL); + void run (int argc, char *argv[] ACE_ENV_ARG_DECL); /// Resolve the naming service. - int resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL); + int resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL); /// = Accessors CORBA::ORB_ptr orb (void); @@ -61,7 +61,7 @@ public: /// Returns priority if server declared model else -1 CORBA::Short get_server_priority (CORBA::Object_ptr server - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// = Callbacks /// Task ended notification void task_ended (Periodic_Task* ended_task); @@ -75,13 +75,13 @@ public: /// = Activation methods. /// Activate the POA's - void activate_poa_list (TAO_ENV_SINGLE_ARG_DECL); + void activate_poa_list (ACE_ENV_SINGLE_ARG_DECL); /// Activate the task list. - void activate_schedule (TAO_ENV_SINGLE_ARG_DECL); + void activate_schedule (ACE_ENV_SINGLE_ARG_DECL); /// Activate the Job's - void activate_job_list (TAO_ENV_SINGLE_ARG_DECL); + void activate_job_list (ACE_ENV_SINGLE_ARG_DECL); /// Check if we should process exit void check_ifexit (void); diff --git a/TAO/examples/RTCORBA/Activity/Job_i.cpp b/TAO/examples/RTCORBA/Activity/Job_i.cpp index dd9cb6a1056..69320dc5323 100644 --- a/TAO/examples/RTCORBA/Activity/Job_i.cpp +++ b/TAO/examples/RTCORBA/Activity/Job_i.cpp @@ -35,7 +35,7 @@ Job_i::init (ACE_Arg_Shifter& arg_shifter) } void -Job_i::work (CORBA::ULong work TAO_ENV_ARG_DECL_NOT_USED) +Job_i::work (CORBA::ULong work ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { static CORBA::ULong prime_number = 9619; @@ -52,7 +52,7 @@ Job_i::work (CORBA::ULong work TAO_ENV_ARG_DECL_NOT_USED) } void -Job_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Job_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACTIVITY::instance()->job_ended (this); diff --git a/TAO/examples/RTCORBA/Activity/Job_i.h b/TAO/examples/RTCORBA/Activity/Job_i.h index f6be6e6211c..c8645d2c054 100644 --- a/TAO/examples/RTCORBA/Activity/Job_i.h +++ b/TAO/examples/RTCORBA/Activity/Job_i.h @@ -37,12 +37,12 @@ class Job_i : public POA_Job, public virtual PortableServer::RefCountServantBase const ACE_CString& poa (void); /// = inteface Job method implementation. - virtual void work (CORBA::ULong work TAO_ENV_ARG_DECL) + virtual void work (CORBA::ULong work ACE_ENV_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/examples/RTCORBA/Activity/POA_Holder.cpp b/TAO/examples/RTCORBA/Activity/POA_Holder.cpp index 68213ab504e..2776d3d4fe4 100644 --- a/TAO/examples/RTCORBA/Activity/POA_Holder.cpp +++ b/TAO/examples/RTCORBA/Activity/POA_Holder.cpp @@ -106,7 +106,7 @@ POA_Holder::init (ACE_Arg_Shifter& arg_shifter) } void -POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_poa TAO_ENV_ARG_DECL) +POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_poa ACE_ENV_ARG_DECL) { /* @@ -133,7 +133,7 @@ POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_ priority_model_policy = rt_orb->create_priority_model_policy (priority_model_, server_priority_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (lanes_.length () != 0) @@ -155,14 +155,14 @@ POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_ allow_request_buffering, max_buffered_requests, max_request_buffer_size - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Create a thread-pool policy. lanes_policy = rt_orb->create_threadpool_policy (threadpool_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -172,7 +172,7 @@ POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_ // Create a bands policy. bands_policy = rt_orb->create_priority_banded_connection_policy (this->bands_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -208,13 +208,13 @@ POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_ // Get the POA Manager. PortableServer::POAManager_var poa_manager = - parent_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + parent_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; parent_poa->create_POA (POA_name_.c_str (), poa_manager.in (), poa_policy_list - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/examples/RTCORBA/Activity/POA_Holder.h b/TAO/examples/RTCORBA/Activity/POA_Holder.h index b4f95140766..d0cb57630dd 100644 --- a/TAO/examples/RTCORBA/Activity/POA_Holder.h +++ b/TAO/examples/RTCORBA/Activity/POA_Holder.h @@ -35,7 +35,7 @@ class POA_Holder /// Activate the new POA using the parameters initialized before. void activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_poa - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); protected: /// = POA create options. diff --git a/TAO/examples/RTCORBA/Activity/Thread_Task.cpp b/TAO/examples/RTCORBA/Activity/Thread_Task.cpp index 16690bc5a9e..49beaae62f5 100644 --- a/TAO/examples/RTCORBA/Activity/Thread_Task.cpp +++ b/TAO/examples/RTCORBA/Activity/Thread_Task.cpp @@ -48,10 +48,10 @@ Thread_Task::svc (void) // if debugging, dump the priority that we're actually at. if (TAO_debug_level > 0) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; // Get the priority of the current thread. RTCORBA::Priority prio = - ACTIVITY::instance()->current ()->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER); + ACTIVITY::instance()->current ()->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (prio == this->task_priority_) diff --git a/TAO/examples/Simple/Simple_util.cpp b/TAO/examples/Simple/Simple_util.cpp index 4a9b205d073..a7a8d5c6d63 100644 --- a/TAO/examples/Simple/Simple_util.cpp +++ b/TAO/examples/Simple/Simple_util.cpp @@ -86,25 +86,25 @@ Server<Servant>::test_for_ins (CORBA::String_var ior) this->ins_, ior.in ())); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::Object_var table_object = orb->resolve_initial_references ("IORTable" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; IORTable::Table_var adapter = IORTable::Table::_narrow (table_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (adapter.in ())) { ACE_ERROR ((LM_ERROR, "Nil IORTable\n")); } - adapter->bind (this->ins_, ior.in () TAO_ENV_ARG_PARAMETER); + adapter->bind (this->ins_, ior.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -120,14 +120,14 @@ template <class Servant> int Server<Servant>::init (const char *servant_name, int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Call the init of <TAO_ORB_Manager> to initialize the ORB and // create a child POA under the root POA. if (this->orb_manager_.init_child_poa (argc, argv, "child_poa" - TAO_ENV_ARG_PARAMETER) == -1) + ACE_ENV_ARG_PARAMETER) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "init_child_poa"), @@ -171,7 +171,7 @@ Server<Servant>::init (const char *servant_name, CORBA::String_var str = this->orb_manager_.activate_under_child_poa (servant_name, &this->servant_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -204,10 +204,10 @@ Server<Servant>::init (const char *servant_name, } template <class Servant>int -Server<Servant>::run (TAO_ENV_SINGLE_ARG_DECL) +Server<Servant>::run (ACE_ENV_SINGLE_ARG_DECL) { // Run the main event loop for the ORB. - 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, "Server_i::run"), -1); @@ -229,20 +229,20 @@ Server<Servant>::register_name (void) bindName.length (1); bindName[0].id = CORBA::string_dup (name); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; // (re)Bind the object. ACE_TRY { - CORBA::Object_var object = servant_._this (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Object_var object = servant_._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - 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; naming_server_->rebind (bindName, object.in() - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Test for INS. @@ -374,7 +374,7 @@ Client<INTERFACE_OBJECT, Var>::init (const char *name, this->argv_ = argv; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -382,7 +382,7 @@ Client<INTERFACE_OBJECT, Var>::init (const char *name, this->orb_ = CORBA::ORB_init (this->argc_, this->argv_, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse command line and verify parameters. @@ -392,7 +392,7 @@ Client<INTERFACE_OBJECT, Var>::init (const char *name, if(this->ior_ != 0) { CORBA::Object_var server_object = - this->orb_->string_to_object (this->ior_ TAO_ENV_ARG_PARAMETER); + this->orb_->string_to_object (this->ior_ ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -402,7 +402,7 @@ Client<INTERFACE_OBJECT, Var>::init (const char *name, this->ior_), -1); this->server_ = INTERFACE_OBJECT::_narrow (server_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else if (this->naming_ == 1) @@ -411,7 +411,7 @@ Client<INTERFACE_OBJECT, Var>::init (const char *name, ACE_DEBUG((LM_DEBUG, "Using the Naming Service \n")); this->name_ = ACE_const_cast (char *, name); - int retv = this->obtain_initial_references (TAO_ENV_SINGLE_ARG_PARAMETER); + int retv = this->obtain_initial_references (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (retv ==-1) return -1; @@ -436,7 +436,7 @@ Client<INTERFACE_OBJECT, Var>::init (const char *name, template <class INTERFACE_OBJECT, class Var> int -Client<INTERFACE_OBJECT, Var>::obtain_initial_references (TAO_ENV_SINGLE_ARG_DECL) +Client<INTERFACE_OBJECT, Var>::obtain_initial_references (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY @@ -455,11 +455,11 @@ Client<INTERFACE_OBJECT, Var>::obtain_initial_references (TAO_ENV_SINGLE_ARG_DEC CORBA::string_dup (this->name_); CORBA::Object_var obj = naming_client_->resolve (server_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->server_ = INTERFACE_OBJECT::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Simple/Simple_util.h b/TAO/examples/Simple/Simple_util.h index 83c3431521a..fcda75c826f 100644 --- a/TAO/examples/Simple/Simple_util.h +++ b/TAO/examples/Simple/Simple_util.h @@ -48,7 +48,7 @@ public: int init (const char *servant_name, int argc, char *argv[] - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize the Server state - parsing arguments and waiting. // interface_name is the name used to register the Servant. @@ -56,7 +56,7 @@ public: // After calling <init>, this method will register the server with // the TAO Naming Service using the servant_name passed to <init>. - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the orb. int test_for_ins (CORBA::String_var ior); @@ -127,7 +127,7 @@ public: void shutdown (int); // Fills in the shutdwon flag. - int obtain_initial_references (TAO_ENV_SINGLE_ARG_DECL); + int obtain_initial_references (ACE_ENV_SINGLE_ARG_DECL); // Initialize naming service protected: diff --git a/TAO/examples/Simple/bank/AccountManager_i.cpp b/TAO/examples/Simple/bank/AccountManager_i.cpp index 02be9d03647..d42cfd37b55 100644 --- a/TAO/examples/Simple/bank/AccountManager_i.cpp +++ b/TAO/examples/Simple/bank/AccountManager_i.cpp @@ -51,7 +51,7 @@ AccountManager_i::set_orb_manager (TAO_ORB_Manager *orb_manager) Bank::Account_ptr AccountManager_i::open (const char *name, CORBA::Float initial_balance - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { Account_i *result = 0; @@ -99,13 +99,13 @@ AccountManager_i::open (const char *name, void AccountManager_i::close (Bank::Account_ptr account - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY { CORBA::String_var name = - CORBA::string_dup (account->name (TAO_ENV_SINGLE_ARG_PARAMETER)); + CORBA::string_dup (account->name (ACE_ENV_SINGLE_ARG_PARAMETER)); ACE_TRY_CHECK; @@ -130,7 +130,7 @@ AccountManager_i::close (Bank::Account_ptr account } void -AccountManager_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +AccountManager_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/examples/Simple/bank/AccountManager_i.h b/TAO/examples/Simple/bank/AccountManager_i.h index d3883ae9036..ba871e1a77f 100644 --- a/TAO/examples/Simple/bank/AccountManager_i.h +++ b/TAO/examples/Simple/bank/AccountManager_i.h @@ -55,17 +55,17 @@ public: virtual Bank::Account_ptr open (const char *name, CORBA::Float initial_balance - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the Account interface with the given name from the server. // Put the initial balance specified in the new account. virtual void close (Bank::Account_ptr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Close the given account. - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Shutdown the server. diff --git a/TAO/examples/Simple/bank/Account_i.cpp b/TAO/examples/Simple/bank/Account_i.cpp index 5e04b7c3b67..2f150afc54a 100644 --- a/TAO/examples/Simple/bank/Account_i.cpp +++ b/TAO/examples/Simple/bank/Account_i.cpp @@ -37,7 +37,7 @@ Account_i::orb (CORBA::ORB_ptr o) // Return the current balance on the server. CORBA::Float -Account_i::balance (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Account_i::balance (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return balance_; @@ -45,7 +45,7 @@ Account_i::balance (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void Account_i::deposit (CORBA::Float deposit - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { balance_ += deposit; @@ -53,7 +53,7 @@ Account_i::deposit (CORBA::Float deposit void Account_i::withdraw (CORBA::Float withdrawl - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Bank::Account::Overdraft)) { @@ -64,7 +64,7 @@ Account_i::withdraw (CORBA::Float withdrawl } char * -Account_i::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Account_i::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->name_.in ()); @@ -72,7 +72,7 @@ Account_i::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void Account_i::name (const char *name - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->name_ = CORBA::string_dup (name); diff --git a/TAO/examples/Simple/bank/Account_i.h b/TAO/examples/Simple/bank/Account_i.h index 6108e950ffc..1190a811220 100644 --- a/TAO/examples/Simple/bank/Account_i.h +++ b/TAO/examples/Simple/bank/Account_i.h @@ -42,27 +42,27 @@ public: ~Account_i (void); // Destructor. - virtual CORBA::Float balance (TAO_ENV_SINGLE_ARG_DECL) + virtual CORBA::Float balance (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Get the current balance in the account. - virtual char *name (TAO_ENV_SINGLE_ARG_DECL) + virtual char *name (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Get the name of the <Account> holder. virtual void name (const char *name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Set the name of the <Account> holder. virtual void deposit (CORBA::Float - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Deposit money in the account. virtual void withdraw (CORBA::Float - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Bank::Account::Overdraft)); // Withdraw money in the account. diff --git a/TAO/examples/Simple/bank/Bank_Client_i.cpp b/TAO/examples/Simple/bank/Bank_Client_i.cpp index fa5c5974368..420febc8e7f 100644 --- a/TAO/examples/Simple/bank/Bank_Client_i.cpp +++ b/TAO/examples/Simple/bank/Bank_Client_i.cpp @@ -32,7 +32,7 @@ Bank_Client_i::run (const char *name, { this->check_accounts (); if (client.shutdown () == 1) - client->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + client->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -52,17 +52,17 @@ Bank_Client_i::check_accounts (void ) { ACE_DEBUG ((LM_DEBUG, "\nTests for account with same name\n")); - this->test_for_same_name (TAO_ENV_SINGLE_ARG_PARAMETER); + this->test_for_same_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "\nTests for account with different names\n")); - this->test_for_different_name (TAO_ENV_SINGLE_ARG_PARAMETER); + this->test_for_different_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "\nTests for overdrafts\n")); - this->test_for_overdraft (TAO_ENV_SINGLE_ARG_PARAMETER); + this->test_for_overdraft (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -78,7 +78,7 @@ Bank_Client_i::check_accounts (void ) // a same name can be opened void -Bank_Client_i::test_for_same_name (TAO_ENV_SINGLE_ARG_DECL) +Bank_Client_i::test_for_same_name (ACE_ENV_SINGLE_ARG_DECL) { const char *name = "Name"; @@ -86,25 +86,25 @@ Bank_Client_i::test_for_same_name (TAO_ENV_SINGLE_ARG_DECL) Bank::Account_var acct_id1 = client->open (name, initial_bal - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); Bank::Account_var acct_id2 = client->open (name, initial_bal - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_ASSERT (acct_id1->_is_equivalent ((CORBA::Object *) acct_id2.in ()) != 0); client->close (acct_id1.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); client->close (acct_id2.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } // This method tests whether an account with different names can be opened void -Bank_Client_i::test_for_different_name (TAO_ENV_SINGLE_ARG_DECL) +Bank_Client_i::test_for_different_name (ACE_ENV_SINGLE_ARG_DECL) { const char *name1 = "Name1"; const char *name2 = "Name2"; @@ -113,39 +113,39 @@ Bank_Client_i::test_for_different_name (TAO_ENV_SINGLE_ARG_DECL) Bank::Account_var acct_id1 = client->open (name1, initial_bal - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); Bank::Account_var acct_id2 = client->open (name2, initial_bal - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_ASSERT (acct_id1->_is_equivalent ((CORBA::Object *)acct_id2.in ()) == 0); client->close (acct_id1.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); client->close (acct_id2.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } // This method tests the Overdraft exception. void -Bank_Client_i::test_for_overdraft (TAO_ENV_SINGLE_ARG_DECL) +Bank_Client_i::test_for_overdraft (ACE_ENV_SINGLE_ARG_DECL) { CORBA::Float initial_bal = 100.0; const char *name = "Name"; - Bank::Account_var acct_id = client->open (name, initial_bal TAO_ENV_ARG_PARAMETER); + Bank::Account_var acct_id = client->open (name, initial_bal ACE_ENV_ARG_PARAMETER); ACE_CHECK; - acct_id->deposit (100.00 TAO_ENV_ARG_PARAMETER); + acct_id->deposit (100.00 ACE_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::Float bal = acct_id->balance (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Float bal = acct_id->balance (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; acct_id->withdraw (bal + 20); - client->close (acct_id.in () TAO_ENV_ARG_PARAMETER); + client->close (acct_id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/examples/Simple/bank/Bank_Client_i.h b/TAO/examples/Simple/bank/Bank_Client_i.h index b8f398daf6e..7f1a4084c8c 100644 --- a/TAO/examples/Simple/bank/Bank_Client_i.h +++ b/TAO/examples/Simple/bank/Bank_Client_i.h @@ -13,9 +13,9 @@ // This class implements the interface calls for RMI. // // = AUTHOR -// +// // Balachandran Natarajan <bala@cs.wustl.edu> -// +// // ============================================================================ #ifndef BANK_CLIENT_I_H @@ -50,15 +50,15 @@ private: int check_accounts (void); // Method that calls all the test functions - void test_for_different_name (TAO_ENV_SINGLE_ARG_DECL); + void test_for_different_name (ACE_ENV_SINGLE_ARG_DECL); // Tests if accounts opened with different names return a different account // reference. - void test_for_same_name (TAO_ENV_SINGLE_ARG_DECL); - // Tests if accounts opened with the same name return the same + void test_for_same_name (ACE_ENV_SINGLE_ARG_DECL); + // Tests if accounts opened with the same name return the same // object reference. - - void test_for_overdraft (TAO_ENV_SINGLE_ARG_DECL); + + void test_for_overdraft (ACE_ENV_SINGLE_ARG_DECL); // Tests for the Overdraft Exception when the client tries to // withdraw more money than the current balance. }; diff --git a/TAO/examples/Simple/bank/server.cpp b/TAO/examples/Simple/bank/server.cpp index cc28654f821..48c04693ff4 100644 --- a/TAO/examples/Simple/bank/server.cpp +++ b/TAO/examples/Simple/bank/server.cpp @@ -17,11 +17,11 @@ main (int argc, char *argv[]) if (server.init ("Bank", argc, argv - TAO_ENV_ARG_PARAMETER) == -1) + ACE_ENV_ARG_PARAMETER) == -1) return 1; else { - server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/examples/Simple/chat/Broadcaster_i.cpp b/TAO/examples/Simple/chat/Broadcaster_i.cpp index 9a3a71e375e..c3be95aab27 100644 --- a/TAO/examples/Simple/chat/Broadcaster_i.cpp +++ b/TAO/examples/Simple/chat/Broadcaster_i.cpp @@ -43,7 +43,7 @@ Broadcaster_i::~Broadcaster_i (void) void Broadcaster_i::add (Receiver_ptr receiver, const char *nickname - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, Broadcaster::CannotAdd @@ -68,7 +68,7 @@ Broadcaster_i::add (Receiver_ptr receiver, ACE_TRY { this->broadcast (broadcast_string.fast_rep () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -82,7 +82,7 @@ Broadcaster_i::add (Receiver_ptr receiver, void Broadcaster_i::remove (Receiver_ptr receiver - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, Broadcaster::CannotRemove @@ -118,14 +118,14 @@ Broadcaster_i::remove (Receiver_ptr receiver + " ****\n"; this->broadcast (broadcast_string.fast_rep () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void Broadcaster_i::say (Receiver_ptr receiver, const char *text - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -152,7 +152,7 @@ Broadcaster_i::say (Receiver_ptr receiver, ACE_CString broadcast_string ("[" + sender_nickname + "] " + text); this->broadcast (broadcast_string.fast_rep () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -166,7 +166,7 @@ Broadcaster_i::say (Receiver_ptr receiver, void Broadcaster_i::broadcast (const char *text - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Broadcast the message to all registered clients. @@ -177,7 +177,7 @@ Broadcaster_i::broadcast (const char *text ACE_TRY { (*iter).receiver_->message (text - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Simple/chat/Broadcaster_i.h b/TAO/examples/Simple/chat/Broadcaster_i.h index 9ff5d1debb7..e85a573ea80 100644 --- a/TAO/examples/Simple/chat/Broadcaster_i.h +++ b/TAO/examples/Simple/chat/Broadcaster_i.h @@ -46,7 +46,7 @@ public: virtual void add (Receiver_ptr receiver, const char *nickname - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, Broadcaster::CannotAdd @@ -54,7 +54,7 @@ public: // Saves receiver references in a list. virtual void remove (Receiver_ptr receiver - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, Broadcaster::CannotRemove @@ -63,7 +63,7 @@ public: virtual void say (Receiver_ptr receiver, const char *text - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); @@ -74,7 +74,7 @@ public: // The ORB manager. void broadcast (const char* text - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Broadcasts the text to all registered clients. class Receiver_Data diff --git a/TAO/examples/Simple/chat/Client_i.cpp b/TAO/examples/Simple/chat/Client_i.cpp index 8bb32f85cf3..5467c3de9ff 100644 --- a/TAO/examples/Simple/chat/Client_i.cpp +++ b/TAO/examples/Simple/chat/Client_i.cpp @@ -88,7 +88,7 @@ Client_i::init (int argc, char *argv[]) this->orb_manager_.init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ORB_var orb = this->orb_manager_.orb (); @@ -105,7 +105,7 @@ Client_i::init (int argc, char *argv[]) CORBA::Object_var server_object = orb->string_to_object (this->ior_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server_object.in ())) @@ -115,7 +115,7 @@ Client_i::init (int argc, char *argv[]) -1); this->server_ = Broadcaster::_narrow (server_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -151,21 +151,21 @@ Client_i::run (void) { PortableServer::POAManager_var poa_manager = this->orb_manager_.poa_manager (); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->receiver_var_ = - this->receiver_i_._this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->receiver_i_._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Register ourselves with the server. server_->add (this->receiver_var_.in (), this->nickname_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Run the ORB. - this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -196,7 +196,7 @@ Client_i::handle_input (ACE_HANDLE) { // Remove ourselves from the server. this->server_->remove (this->receiver_var_.in ()); - this->receiver_i_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->receiver_i_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; return 0; @@ -206,7 +206,7 @@ Client_i::handle_input (ACE_HANDLE) // the server. this->server_->say (this->receiver_var_.in (), buf - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Simple/chat/Receiver_i.cpp b/TAO/examples/Simple/chat/Receiver_i.cpp index dbf9e772cb1..ac2ba71f635 100644 --- a/TAO/examples/Simple/chat/Receiver_i.cpp +++ b/TAO/examples/Simple/chat/Receiver_i.cpp @@ -29,7 +29,7 @@ Receiver_i::~Receiver_i (void) void Receiver_i::message (const char *msg - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -40,7 +40,7 @@ Receiver_i::message (const char *msg } void -Receiver_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Receiver_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) diff --git a/TAO/examples/Simple/chat/Receiver_i.h b/TAO/examples/Simple/chat/Receiver_i.h index d7cb7648bda..7c3a0767517 100644 --- a/TAO/examples/Simple/chat/Receiver_i.h +++ b/TAO/examples/Simple/chat/Receiver_i.h @@ -38,13 +38,13 @@ public: // Destructor. virtual void message (const char *msg - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )); // Receives a message string. - 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/examples/Simple/chat/Server_i.cpp b/TAO/examples/Simple/chat/Server_i.cpp index fa68b36aa10..19552c68eac 100644 --- a/TAO/examples/Simple/chat/Server_i.cpp +++ b/TAO/examples/Simple/chat/Server_i.cpp @@ -60,7 +60,7 @@ Server_i::parse_args (int argc, char *argv[]) int Server_i::init (int argc, char *argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Parse the command line options. if (this-> parse_args(argc, argv) == -1) @@ -68,7 +68,7 @@ Server_i::init (int argc, if (this->orb_manager_.init (argc, argv - TAO_ENV_ARG_PARAMETER) == -1) + ACE_ENV_ARG_PARAMETER) == -1) ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb manager init failed\n"), @@ -80,7 +80,7 @@ Server_i::init (int argc, // Activate the servant. CORBA::String_var str = this->orb_manager_.activate (&this->broadcaster_i_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Write the IOR to a file. @@ -89,13 +89,13 @@ Server_i::init (int argc, } int -Server_i::run (TAO_ENV_SINGLE_ARG_DECL) +Server_i::run (ACE_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "Running chat server...\n")); // Run the main event loop for the ORB. - int ret = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER); + int ret = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (ret == -1) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/examples/Simple/chat/Server_i.h b/TAO/examples/Simple/chat/Server_i.h index 48d2155adee..9214585fea1 100644 --- a/TAO/examples/Simple/chat/Server_i.h +++ b/TAO/examples/Simple/chat/Server_i.h @@ -40,10 +40,10 @@ public: int init (int argc, char *argv[] - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize the server. - int run (TAO_ENV_SINGLE_ARG_DECL); + int run (ACE_ENV_SINGLE_ARG_DECL); // Run the ORB. private: diff --git a/TAO/examples/Simple/chat/server.cpp b/TAO/examples/Simple/chat/server.cpp index 09120b3fef0..66937b85a2e 100644 --- a/TAO/examples/Simple/chat/server.cpp +++ b/TAO/examples/Simple/chat/server.cpp @@ -27,13 +27,13 @@ main (int argc, char *argv[]) { Server_i server_i; - int ret = server_i.init (argc, argv TAO_ENV_ARG_PARAMETER); + int ret = server_i.init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (ret != 0) ACE_ERROR_RETURN ((LM_ERROR, "\n error in init.\n"), 1); - ret = server_i.run (TAO_ENV_SINGLE_ARG_PARAMETER); + ret = server_i.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (ret != 0) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/examples/Simple/echo/Echo_Client_i.cpp b/TAO/examples/Simple/echo/Echo_Client_i.cpp index 303b36b08cd..640992d852b 100644 --- a/TAO/examples/Simple/echo/Echo_Client_i.cpp +++ b/TAO/examples/Simple/echo/Echo_Client_i.cpp @@ -27,7 +27,7 @@ Echo_Client_i::run (const char *name, if (client.init (name,argc, argv) == -1) return -1; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -43,7 +43,7 @@ Echo_Client_i::run (const char *name, break; CORBA::String_var s = client->echo_string (buf - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -52,7 +52,7 @@ Echo_Client_i::run (const char *name, } if (client.shutdown () == 1) - client->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + client->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/examples/Simple/echo/Echo_i.cpp b/TAO/examples/Simple/echo/Echo_i.cpp index dc65c299d82..2635c25d08c 100644 --- a/TAO/examples/Simple/echo/Echo_i.cpp +++ b/TAO/examples/Simple/echo/Echo_i.cpp @@ -34,7 +34,7 @@ Echo_i::orb (CORBA::ORB_ptr o) Echo::List * Echo_i::echo_list (const char * - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { Echo::List_var list; @@ -54,17 +54,17 @@ Echo_i::echo_list (const char * // Just do something to get a list of object references. list[CORBA::ULong(0)] = orb_->resolve_initial_references ("NameService" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); list[CORBA::ULong(1)] = orb_->resolve_initial_references ("NameService" - TAO_ENV_ARG_PARAMETER);; + ACE_ENV_ARG_PARAMETER);; ACE_CHECK_RETURN (0); list[CORBA::ULong(2)] = orb_->resolve_initial_references ("NameService" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return list._retn (); @@ -74,7 +74,7 @@ Echo_i::echo_list (const char * char * Echo_i::echo_string (const char *mesg - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // The pointer mesg was NULL, return. @@ -100,7 +100,7 @@ Echo_i::echo_string (const char *mesg // Shutdown the server application. void -Echo_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/examples/Simple/echo/Echo_i.h b/TAO/examples/Simple/echo/Echo_i.h index a57fc92d49d..333ec8ebdf7 100644 --- a/TAO/examples/Simple/echo/Echo_i.h +++ b/TAO/examples/Simple/echo/Echo_i.h @@ -44,16 +44,16 @@ public: // Destructor. virtual Echo::List *echo_list (const char *mesg - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the mesg string back from the server. virtual char *echo_string (const char *mesg - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the mesg string back from the server. - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Shutdown the server. diff --git a/TAO/examples/Simple/echo/server.cpp b/TAO/examples/Simple/echo/server.cpp index da5802ac71f..61fedc66cc8 100644 --- a/TAO/examples/Simple/echo/server.cpp +++ b/TAO/examples/Simple/echo/server.cpp @@ -12,18 +12,18 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "\n\tEcho server\n\n")); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { if (server.init ("Echo", argc, argv - TAO_ENV_ARG_PARAMETER) == -1) + ACE_ENV_ARG_PARAMETER) == -1) return 1; else { - server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/examples/Simple/grid/Grid_Client_i.cpp b/TAO/examples/Simple/grid/Grid_Client_i.cpp index 87f68f83547..0b9a48f6a69 100644 --- a/TAO/examples/Simple/grid/Grid_Client_i.cpp +++ b/TAO/examples/Simple/grid/Grid_Client_i.cpp @@ -75,7 +75,7 @@ Grid_Client_i::run (const char *name, if (this->parse_args (argc, argv) == -1) return -1; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -83,7 +83,7 @@ Grid_Client_i::run (const char *name, Grid_ptr grid = client->make_grid (width_, height_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -93,7 +93,7 @@ Grid_Client_i::run (const char *name, grid->set (setx_, sety_, value_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -101,13 +101,13 @@ Grid_Client_i::run (const char *name, CORBA::Long ret_val = grid->get (setx_, sety_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_ASSERT (ret_val == value_); if (client.shutdown () == 1) { - client->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + client->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_UNUSED_ARG (ret_val); diff --git a/TAO/examples/Simple/grid/Grid_i.cpp b/TAO/examples/Simple/grid/Grid_i.cpp index 56dc3177fe7..75614a73df9 100644 --- a/TAO/examples/Simple/grid/Grid_i.cpp +++ b/TAO/examples/Simple/grid/Grid_i.cpp @@ -17,7 +17,7 @@ Grid_i::Grid_i (void) Grid_i::Grid_i (CORBA::Short x, CORBA::Short y - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) : width_ (x), height_ (y) { @@ -51,7 +51,7 @@ void Grid_i::set (CORBA::Short x, CORBA::Short y, CORBA::Long value - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Grid::RANGE_ERROR)) { @@ -69,7 +69,7 @@ Grid_i::set (CORBA::Short x, CORBA::Long Grid_i::get (CORBA::Short x, CORBA::Short y - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Grid::RANGE_ERROR)) { @@ -85,14 +85,14 @@ Grid_i::get (CORBA::Short x, // Access methods. CORBA::Short -Grid_i::width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Grid_i::width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->width_; } CORBA::Short -Grid_i::height (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Grid_i::height (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->height_; @@ -100,7 +100,7 @@ Grid_i::height (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void Grid_i::width (CORBA::Short x - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->width_ = x; @@ -108,7 +108,7 @@ Grid_i::width (CORBA::Short x void Grid_i::height (CORBA::Short y - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->height_ = y; @@ -117,7 +117,7 @@ Grid_i::height (CORBA::Short y // Destroy the grid void -Grid_i::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Grid_i::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // Delete the array. @@ -143,7 +143,7 @@ Grid_Factory_i::orb (CORBA::ORB_ptr o) // Shutdown. void -Grid_Factory_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Grid_Factory_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -181,7 +181,7 @@ Grid_Factory_i::~Grid_Factory_i (void) Grid_ptr Grid_Factory_i::make_grid (CORBA::Short width, CORBA::Short height - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { Grid_i *grid_ptr = 0; @@ -200,12 +200,12 @@ Grid_Factory_i::make_grid (CORBA::Short width, // This attempts to create a new Grid_i and throws an exception and // returns a null value if it fails ACE_NEW_THROW_EX (grid_ptr, - Grid_i (width, height TAO_ENV_ARG_PARAMETER), + Grid_i (width, height ACE_ENV_ARG_PARAMETER), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (Grid::_nil ()); // Register the Grid pointer. - Grid_ptr gptr = grid_ptr->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + Grid_ptr gptr = grid_ptr->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return gptr; } diff --git a/TAO/examples/Simple/grid/Grid_i.h b/TAO/examples/Simple/grid/Grid_i.h index 6b307072ec3..b0e59875924 100644 --- a/TAO/examples/Simple/grid/Grid_i.h +++ b/TAO/examples/Simple/grid/Grid_i.h @@ -36,46 +36,46 @@ public: Grid_i (CORBA::Short, CORBA::Short - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Constructor. ~Grid_i (void); // Destructor - virtual CORBA::Short width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual CORBA::Short width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns the width of the grid - virtual CORBA::Short height (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual CORBA::Short height (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Returns the height of the grid virtual void width (CORBA::Short - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Sets the width of the grid. virtual void height (CORBA::Short - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Sets the height of the grid. virtual void set (CORBA::Short, CORBA::Short, CORBA::Long - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, Grid::RANGE_ERROR)); // Sets the grid value. virtual CORBA::Long get (CORBA::Short, CORBA::Short - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, Grid::RANGE_ERROR)); // Gets the grid value. - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Destroy the grid. @@ -108,11 +108,11 @@ public: virtual Grid_ptr make_grid (CORBA::Short, CORBA::Short - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // This function creates and returns a <Grid>. - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Shutdown the server. diff --git a/TAO/examples/Simple/grid/server.cpp b/TAO/examples/Simple/grid/server.cpp index 77592bc8f36..09ad64e8ef3 100644 --- a/TAO/examples/Simple/grid/server.cpp +++ b/TAO/examples/Simple/grid/server.cpp @@ -12,18 +12,18 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "\n\tGrid server\n\n")); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { if (server.init ("Grid", argc, argv - TAO_ENV_ARG_PARAMETER) == -1) + ACE_ENV_ARG_PARAMETER) == -1) return 1; else { - server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/examples/Simple/time-date/Time_Date.cpp b/TAO/examples/Simple/time-date/Time_Date.cpp index abed3c23fc4..1796289bad4 100644 --- a/TAO/examples/Simple/time-date/Time_Date.cpp +++ b/TAO/examples/Simple/time-date/Time_Date.cpp @@ -32,7 +32,7 @@ DLL_ORB::svc (void) ACE_TRY_NEW_ENV { // Run the ORB event loop in its own thread. - this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) @@ -70,7 +70,7 @@ DLL_ORB::init (int argc, char *argv[]) // Initialize the ORB. this->orb_manager_.init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #if defined (ACE_HAS_THREADS) @@ -155,7 +155,7 @@ Time_Date_Servant::init (int argc, char *argv[]) -1); CORBA::String_var str = orb->orb_manager_.activate (&servant_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->ior_output_file_) diff --git a/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp b/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp index aed8f602682..40bb4c947d8 100644 --- a/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp +++ b/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp @@ -37,7 +37,7 @@ Time_Date_Client_i::run (const char *name, if (this->parse_args (argc, argv) == -1) return -1; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { @@ -45,7 +45,7 @@ Time_Date_Client_i::run (const char *name, // Get the time & date in binary format. client_->bin_date (l - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -55,7 +55,7 @@ Time_Date_Client_i::run (const char *name, // Get the time & date in string format. CORBA::String_var str_var; client_->str_date (str_var.out() - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/examples/Simple/time-date/Time_Date_i.cpp b/TAO/examples/Simple/time-date/Time_Date_i.cpp index cd46a87417e..1b4cc0854e9 100644 --- a/TAO/examples/Simple/time-date/Time_Date_i.cpp +++ b/TAO/examples/Simple/time-date/Time_Date_i.cpp @@ -22,7 +22,7 @@ Time_Date_i::~Time_Date_i (void) void Time_Date_i::bin_date (CORBA::Long_out time_date - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { time_date = ACE_OS::time (0); @@ -32,7 +32,7 @@ Time_Date_i::bin_date (CORBA::Long_out time_date void Time_Date_i::str_date (CORBA::String_out time_date - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { const time_t time = ACE_OS::time (0); diff --git a/TAO/examples/Simple/time-date/Time_Date_i.h b/TAO/examples/Simple/time-date/Time_Date_i.h index 30475dd5968..1b727cd2cf9 100644 --- a/TAO/examples/Simple/time-date/Time_Date_i.h +++ b/TAO/examples/Simple/time-date/Time_Date_i.h @@ -39,13 +39,13 @@ public: // Destructor virtual void bin_date (CORBA::Long_out time_date - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Obtain the time and date in binary format. virtual void str_date (CORBA::String_out time_date - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Obtain the time and date in string format. diff --git a/TAO/examples/Simple/time/Time_Client_i.cpp b/TAO/examples/Simple/time/Time_Client_i.cpp index c32a015f0e5..8ec47f9b5c5 100644 --- a/TAO/examples/Simple/time/Time_Client_i.cpp +++ b/TAO/examples/Simple/time/Time_Client_i.cpp @@ -30,9 +30,9 @@ Time_Client_i::run (const char *name, ACE_TRY { //Make the RMI. - CORBA::Long timedate = client->current_time (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Long timedate = client->current_time (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - + // Print out value char *ascii_timedate = ACE_OS::ctime (ACE_reinterpret_cast (time_t *, @@ -42,7 +42,7 @@ Time_Client_i::run (const char *name, ascii_timedate)); if (client.shutdown () == 1) - client->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + client->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -51,7 +51,7 @@ Time_Client_i::run (const char *name, return -1; } ACE_ENDTRY; - + return 0; } diff --git a/TAO/examples/Simple/time/Time_i.cpp b/TAO/examples/Simple/time/Time_i.cpp index 13c0494ecd2..758603bb25b 100644 --- a/TAO/examples/Simple/time/Time_i.cpp +++ b/TAO/examples/Simple/time/Time_i.cpp @@ -35,7 +35,7 @@ Time_i::orb (CORBA::ORB_ptr o) // Return the current date/time on the server. CORBA::Long -Time_i::current_time (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Time_i::current_time (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::Long (ACE_OS::time (0)); @@ -43,8 +43,8 @@ Time_i::current_time (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) // Shutdown. -void -Time_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED ) +void +Time_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/examples/Simple/time/Time_i.h b/TAO/examples/Simple/time/Time_i.h index caa7cebeada..82514034cca 100644 --- a/TAO/examples/Simple/time/Time_i.h +++ b/TAO/examples/Simple/time/Time_i.h @@ -43,11 +43,11 @@ public: ~Time_i (void); // Destructor - virtual CORBA::Long current_time (TAO_ENV_SINGLE_ARG_DECL) + virtual CORBA::Long current_time (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Return the current time/date on the server - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); // Shutdown the server. diff --git a/TAO/examples/Simple/time/server.cpp b/TAO/examples/Simple/time/server.cpp index d0a1720923f..5cdd40fbec2 100644 --- a/TAO/examples/Simple/time/server.cpp +++ b/TAO/examples/Simple/time/server.cpp @@ -12,18 +12,18 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "\n\tTime and Date server\n\n")); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { if (server.init ("Time", argc, argv - TAO_ENV_ARG_PARAMETER) == -1) + ACE_ENV_ARG_PARAMETER) == -1) return 1; else { - server.run (TAO_ENV_SINGLE_ARG_PARAMETER); + server.run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp index 1d687e512e9..a8a39910057 100644 --- a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp +++ b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp @@ -72,7 +72,7 @@ DOVE_Supplier::init (void) // Connect to the RootPOA. CORBA::Object_var poaObject_var = TAO_ORB_Core_instance()->orb()->resolve_initial_references("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poaObject_var.in ())) @@ -81,18 +81,18 @@ DOVE_Supplier::init (void) -1); this->root_POA_var_ = - PortableServer::POA::_narrow (poaObject_var.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poaObject_var.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->poa_manager_ = - root_POA_var_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_POA_var_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Get the Naming Service object reference. CORBA::Object_var namingObj_var = TAO_ORB_Core_instance()->orb()->resolve_initial_references ( "NameService" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (namingObj_var.in ())) @@ -102,7 +102,7 @@ DOVE_Supplier::init (void) this->namingContext_var_ = CosNaming::NamingContext::_narrow (namingObj_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -273,7 +273,7 @@ DOVE_Supplier::notify (CORBA::Any &message) // Now we invoke a RPC this->current_connection_params_->proxyPushConsumer_var_->push (events - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -343,12 +343,12 @@ DOVE_Supplier::get_Scheduler () CORBA::Object_var objref = namingContext_var_->resolve (schedule_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->current_connection_params_->scheduler_var_ = RtecScheduler::Scheduler::_narrow(objref.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -378,12 +378,12 @@ DOVE_Supplier::get_EventChannel () CORBA::string_dup (this->current_connection_params_->es_name_); CORBA::Object_var eventServiceObj_var = - this->namingContext_var_->resolve (channel_name TAO_ENV_ARG_PARAMETER); + this->namingContext_var_->resolve (channel_name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->current_connection_params_->eventChannel_var_ = RtecEventChannelAdmin::EventChannel::_narrow (eventServiceObj_var.in() - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (this->current_connection_params_->eventChannel_var_.in())) @@ -413,7 +413,7 @@ DOVE_Supplier::connect_Supplier () this->current_connection_params_-> scheduler_var_-> create (this->current_connection_params_->pod_rt_info_.entry_point - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -431,7 +431,7 @@ DOVE_Supplier::connect_Supplier () this->current_connection_params_->pod_rt_info_.threads, ACE_static_cast (RtecScheduler::Info_Type_t, this->current_connection_params_->pod_rt_info_.info_type) - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -455,17 +455,17 @@ DOVE_Supplier::connect_Supplier () // = Connect as a supplier. this->current_connection_params_->supplierAdmin_var_ = - this->current_connection_params_->eventChannel_var_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->current_connection_params_->eventChannel_var_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->current_connection_params_->proxyPushConsumer_var_ = - this->current_connection_params_->supplierAdmin_var_->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + this->current_connection_params_->supplierAdmin_var_->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // In calling _this we get back an object reference and register // the servant with the POA. RtecEventComm::PushSupplier_var pushSupplier_var = - this->internal_DOVE_Supplier_ptr_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->internal_DOVE_Supplier_ptr_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Connect the supplier to the proxy consumer. @@ -473,7 +473,7 @@ DOVE_Supplier::connect_Supplier () this->current_connection_params_-> proxyPushConsumer_var_->connect_push_supplier (pushSupplier_var.in (), qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h index 259919ec604..fc6b9de6843 100644 --- a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h +++ b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h @@ -45,9 +45,9 @@ public: int init (void); // Initialize the ORB and the connection to the Name Service - int connect (const char * MIB_name = 0, + int connect (const char * MIB_name = 0, const char* es_name = 0, - const char * ss_name = 0, + const char * ss_name = 0, ACE_Scheduler_Factory::POD_RT_Info * pod_rt_info = 0); // Connect to the event service. @@ -77,7 +77,7 @@ private: public: - virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp index 8e753eaf732..6f0f6f22c35 100644 --- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp +++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp @@ -99,7 +99,7 @@ DualEC_Supplier::DualEC_Supplier (int argc, char** argv) this->channel_lo_name_[0].id = CORBA::string_dup ("DUAL_EC_LO"); ACE_TRY_CHECK; - this->terminator_ = terminator_impl_._this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->terminator_ = terminator_impl_._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -151,15 +151,15 @@ DualEC_Supplier::~DualEC_Supplier () this->weapons_Supplier_.disconnect (); // Unbind the schedulers from the NS. - this->naming_context_->unbind (this->sched_hi_name_ TAO_ENV_ARG_PARAMETER); + this->naming_context_->unbind (this->sched_hi_name_ ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->naming_context_->unbind (this->sched_lo_name_ TAO_ENV_ARG_PARAMETER); + this->naming_context_->unbind (this->sched_lo_name_ ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Unbind the ECs from the NS. - this->naming_context_->unbind (this->channel_hi_name_ TAO_ENV_ARG_PARAMETER); + this->naming_context_->unbind (this->channel_hi_name_ ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->naming_context_->unbind (this->channel_lo_name_ TAO_ENV_ARG_PARAMETER); + this->naming_context_->unbind (this->channel_lo_name_ ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -182,7 +182,7 @@ DualEC_Supplier::init () { // Connect to the RootPOA. CORBA::Object_var poaObject_var = - TAO_ORB_Core_instance()->orb()->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + TAO_ORB_Core_instance()->orb()->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poaObject_var.in ())) @@ -191,21 +191,21 @@ DualEC_Supplier::init () 1); this->root_POA_var_ = - PortableServer::POA::_narrow (poaObject_var.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poaObject_var.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->poa_manager_ = - root_POA_var_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_POA_var_->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; // Get the Naming Service object reference. CORBA::Object_var namingObj_var = TAO_ORB_Core_instance()->orb()->resolve_initial_references ( "NameService" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (namingObj_var.in ())) @@ -215,7 +215,7 @@ DualEC_Supplier::init () this->naming_context_ = CosNaming::NamingContext::_narrow (namingObj_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -299,7 +299,7 @@ DualEC_Supplier::init () // Private class that implements a termination servant. void -DualEC_Supplier::Terminator::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +DualEC_Supplier::Terminator::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ORB_Core_instance ()->orb ()->shutdown (); @@ -497,24 +497,24 @@ DualEC_Supplier::create_schedulers (void) ACE_Config_Scheduler, -1); - this->sched_hi_ = sched_hi_impl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->sched_hi_ = sched_hi_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_NEW_RETURN (this->sched_lo_impl_, ACE_Config_Scheduler, -1); - this->sched_lo_ = sched_lo_impl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->sched_lo_ = sched_lo_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Register Scheduling Service Implementations with Naming Service this->naming_context_->bind (this ->sched_hi_name_, - this->sched_hi_.in () TAO_ENV_ARG_PARAMETER); + this->sched_hi_.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; naming_context_->bind (this->sched_lo_name_, - this->sched_lo_.in () TAO_ENV_ARG_PARAMETER); + this->sched_lo_.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Register high and low priority rt_infos with the @@ -523,7 +523,7 @@ DualEC_Supplier::create_schedulers (void) this->sched_hi_rt_info_hi_ = this->sched_hi_-> create (this->rt_info_dummy_hi_.entry_point - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -541,14 +541,14 @@ DualEC_Supplier::create_schedulers (void) this->rt_info_dummy_hi_.threads, ACE_static_cast (RtecScheduler::Info_Type_t, this->rt_info_dummy_hi_.info_type) - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->sched_hi_rt_info_lo_ = this->sched_hi_-> create (this->rt_info_dummy_lo_.entry_point - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -566,14 +566,14 @@ DualEC_Supplier::create_schedulers (void) this->rt_info_dummy_lo_.threads, ACE_static_cast (RtecScheduler::Info_Type_t, this->rt_info_dummy_lo_.info_type) - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->sched_hi_rt_info_hi_ = this->sched_lo_-> create (this->rt_info_dummy_hi_.entry_point - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -591,14 +591,14 @@ DualEC_Supplier::create_schedulers (void) this->rt_info_dummy_hi_.threads, ACE_static_cast (RtecScheduler::Info_Type_t, this->rt_info_dummy_hi_.info_type) - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->sched_hi_rt_info_lo_ = this->sched_lo_-> create (this->rt_info_dummy_lo_.entry_point - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -616,7 +616,7 @@ DualEC_Supplier::create_schedulers (void) this->rt_info_dummy_lo_.threads, ACE_static_cast (RtecScheduler::Info_Type_t, this->rt_info_dummy_lo_.info_type) - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -651,7 +651,7 @@ DualEC_Supplier::create_event_channels (void) &default_module_factory_), -1); - this->ec_hi_ = ec_hi_impl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->ec_hi_ = ec_hi_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_NEW_RETURN (this->ec_lo_impl_, @@ -661,17 +661,17 @@ DualEC_Supplier::create_event_channels (void) &default_module_factory_), -1); - this->ec_lo_ = ec_lo_impl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->ec_lo_ = ec_lo_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Register Event Service Implementations with Naming Service naming_context_->bind (this->channel_hi_name_, - this->ec_hi_.in () TAO_ENV_ARG_PARAMETER); + this->ec_hi_.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; naming_context_->bind (this->channel_lo_name_, - this->ec_lo_.in () TAO_ENV_ARG_PARAMETER); + this->ec_lo_.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -711,7 +711,7 @@ DualEC_Supplier::compute_schedules (void) ACE_SCOPE_THREAD), ACE_Sched_Params::priority_max (ACE_SCHED_FIFO, ACE_SCOPE_THREAD), - infos_out_hi, configs_out_hi, anomalies_out_hi TAO_ENV_ARG_PARAMETER); + infos_out_hi, configs_out_hi, anomalies_out_hi ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RtecScheduler::RT_Info_Set_out infos_out_lo (this->infos_lo_); @@ -722,7 +722,7 @@ DualEC_Supplier::compute_schedules (void) ACE_SCOPE_THREAD), ACE_Sched_Params::priority_max (ACE_SCHED_FIFO, ACE_SCOPE_THREAD), - infos_out_lo, configs_out_lo, anomalies_out_lo TAO_ENV_ARG_PARAMETER); + infos_out_lo, configs_out_lo, anomalies_out_lo ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #else /* ! __SUNPRO_CC */ @@ -733,7 +733,7 @@ DualEC_Supplier::compute_schedules (void) ACE_Sched_Params::priority_max (ACE_SCHED_FIFO, ACE_SCOPE_THREAD), this->infos_hi_.out (), this->configs_hi_.out (), - this->anomalies_hi_.out () TAO_ENV_ARG_PARAMETER); + this->anomalies_hi_.out () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; sched_lo_->compute_scheduling @@ -742,7 +742,7 @@ DualEC_Supplier::compute_schedules (void) ACE_Sched_Params::priority_max (ACE_SCHED_FIFO, ACE_SCOPE_THREAD), this->infos_lo_.out (), this->configs_lo_.out (), - this->anomalies_lo_.out () TAO_ENV_ARG_PARAMETER); + this->anomalies_lo_.out () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* ! __SUNPRO_CC */ @@ -1153,7 +1153,7 @@ main (int argc, char *argv []) orb_Manager.init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h index 52f1f9c35ee..cb525dc896f 100644 --- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h +++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h @@ -85,7 +85,7 @@ private: // = DESCRIPTION // Private class that implements a termination servant. { - void shutdown (TAO_ENV_SINGLE_ARG_DECL) + void shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); }; diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp index c279d60d2a4..c0a076e6792 100644 --- a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp +++ b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp @@ -59,7 +59,7 @@ int Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec, const char *my_name) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Get a Scheduler. @@ -68,7 +68,7 @@ Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec, ACE_Scheduler_Factory::server (); // Define Real-time information. - rt_info_ = server->create (my_name TAO_ENV_ARG_PARAMETER); + rt_info_ = server->create (my_name ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; server->set (rt_info_, @@ -81,7 +81,7 @@ Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec, ORBSVCS_Time::zero (), 1, RtecScheduler::OPERATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -100,14 +100,14 @@ Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec, // = Connect as a consumer. this->consumer_admin_ = - channel_admin_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + channel_admin_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain a pointer to a push supplier. "suppliers" is // inherited from a base class. this->suppliers_ = - consumer_admin_->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_admin_->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // The _this function returns an object pointer. This is needed @@ -115,12 +115,12 @@ Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec, // CORBA::Object. RtecEventComm::PushConsumer_var objref = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->suppliers_->connect_push_consumer (objref.in (), dependencies.get_ConsumerQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR, se) @@ -141,7 +141,7 @@ Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec, } void -Demo_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +Demo_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -150,7 +150,7 @@ Demo_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void Demo_Consumer::push (const RtecEventComm::EventSet &events - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -177,18 +177,18 @@ Demo_Consumer::push (const RtecEventComm::EventSet &events { // Use a temporary int to avoid overload ambiguities with // the enum. - int kind = events[i].data.any_value.type()->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + int kind = events[i].data.any_value.type()->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - cout << "ID: " << events[i].data.any_value.type()->id(TAO_ENV_SINGLE_ARG_PARAMETER) << endl; + cout << "ID: " << events[i].data.any_value.type()->id(ACE_ENV_SINGLE_ARG_PARAMETER) << endl; ACE_TRY_CHECK; - cout << "Name: " << events[i].data.any_value.type()->name(TAO_ENV_SINGLE_ARG_PARAMETER) << endl; + cout << "Name: " << events[i].data.any_value.type()->name(ACE_ENV_SINGLE_ARG_PARAMETER) << endl; ACE_TRY_CHECK; - cout << "member_count: " << events[i].data.any_value.type()->member_count(TAO_ENV_SINGLE_ARG_PARAMETER) << endl; + cout << "member_count: " << events[i].data.any_value.type()->member_count(ACE_ENV_SINGLE_ARG_PARAMETER) << endl; ACE_TRY_CHECK; cout << "TCKind: " << kind << endl; - int ret = _tc_Navigation->equal (events[i].data.any_value.type() TAO_ENV_ARG_PARAMETER); + int ret = _tc_Navigation->equal (events[i].data.any_value.type() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (ret) { @@ -196,7 +196,7 @@ Demo_Consumer::push (const RtecEventComm::EventSet &events cout << "Found a Navigation struct in the any: pos_lat = " << navigation_->position_latitude << endl; } else { - ret = (_tc_Weapons->equal (events[i].data.any_value.type() TAO_ENV_ARG_PARAMETER)); + ret = (_tc_Weapons->equal (events[i].data.any_value.type() ACE_ENV_ARG_PARAMETER)); ACE_TRY_CHECK; if (ret) { Weapons *weapons_ = (Weapons*) events[i].data.any_value.value (); @@ -221,7 +221,7 @@ Demo_Consumer::shutdown (void) { // Disconnect from the push supplier. - this->suppliers_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + this->suppliers_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "@@ we should shutdown here!!!\n")); @@ -286,12 +286,12 @@ main (int argc, char *argv []) // Initialize ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "internet" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "internet" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -300,16 +300,16 @@ 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; CORBA::Object_var naming_obj = orb->resolve_initial_references ("NameService" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (naming_obj.in ())) @@ -319,7 +319,7 @@ main (int argc, char *argv []) CosNaming::NamingContext_var naming_context = CosNaming::NamingContext::_narrow (naming_obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Scheduler_Factory::use_config (naming_context.in ()); @@ -335,11 +335,11 @@ main (int argc, char *argv []) CORBA::Object_var ec_obj = naming_context->resolve (channel_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var ec = - RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in() TAO_ENV_ARG_PARAMETER); + RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in() ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (ec.ptr() == 0) @@ -360,19 +360,19 @@ main (int argc, char *argv []) "Someone was feeling introverted.\n"), -1); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Run the ORB - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; delete demo_consumer; root_poa->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Con.h b/TAO/examples/Simulator/Event_Supplier/Event_Con.h index bf2ace6ab79..0e0d931a3d9 100644 --- a/TAO/examples/Simulator/Event_Supplier/Event_Con.h +++ b/TAO/examples/Simulator/Event_Supplier/Event_Con.h @@ -46,13 +46,13 @@ public: // supplier. Stores <my_name> for printing out messages. Returns 0 // on success, -1 on failure. - virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // The channel is disconnecting. // = (not protected to allow short-circuiting) protected: virtual void push (const RtecEventComm::EventSet &events - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // If the <events>[0] is a notification, prints out the data from // the supplier. If its a shutdown message, the consumer diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp index 9944b1012ff..1d42b0c1598 100644 --- a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp +++ b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp @@ -447,7 +447,7 @@ main (int argc, char *argv []) orb_Manager.init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp index d6582abfbbe..6bf504cefdb 100644 --- a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp +++ b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp @@ -493,7 +493,7 @@ main (int argc, char *argv []) orb_Manager.init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/examples/TypeCode_Creation/main.cpp b/TAO/examples/TypeCode_Creation/main.cpp index e8dbba5999a..b811e0b9aca 100644 --- a/TAO/examples/TypeCode_Creation/main.cpp +++ b/TAO/examples/TypeCode_Creation/main.cpp @@ -13,13 +13,13 @@ int 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::TypeCode_var iface_tc = orb->create_interface_tc (CORBA::string_dup ("IDL:iface:1.0"), CORBA::string_dup ("iface") - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ULong length = 5; @@ -73,7 +73,7 @@ int main(int argc, char *argv[]) "foo", CORBA::_tc_short, foo_members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; length = 2; @@ -95,12 +95,12 @@ int main(int argc, char *argv[]) CORBA::TypeCode_var bar_tc = orb->create_struct_tc ("IDL:bar:1.0", "bar", bar_members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Check for equality with the typecode created by the IDL compiler. CORBA::Boolean eq = bar_tc->equal (_tc_bar - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!eq) diff --git a/TAO/examples/mfc/client.cpp b/TAO/examples/mfc/client.cpp index 20e1d865e99..3fcc3f4abff 100644 --- a/TAO/examples/mfc/client.cpp +++ b/TAO/examples/mfc/client.cpp @@ -15,19 +15,19 @@ main (int argc, char *argv[]) CORBA::ORB_var the_orb = CORBA::ORB_init (argc, argv, orb_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var orb_obj = - the_orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + the_orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var the_root_poa = - PortableServer::POA::_narrow (orb_obj.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (orb_obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var the_poa_manager = - the_root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + the_root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Retrieving the servants IOR from a file @@ -37,13 +37,13 @@ main (int argc, char *argv[]) "file://ior.txt"; orb_obj = - the_orb->string_to_object (filename TAO_ENV_ARG_PARAMETER); + the_orb->string_to_object (filename ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; cout << "Narrowing the IOR!" << endl; W32_Test_Interface_var mycall = - W32_Test_Interface::_narrow (orb_obj.in () TAO_ENV_ARG_PARAMETER); + W32_Test_Interface::_narrow (orb_obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; cout << "Sending the Request!" << endl; diff --git a/TAO/examples/mfc/server.cpp b/TAO/examples/mfc/server.cpp index 961d501be4d..e9ff39967c4 100644 --- a/TAO/examples/mfc/server.cpp +++ b/TAO/examples/mfc/server.cpp @@ -50,22 +50,22 @@ spawn_my_orb_thread (void *) CORBA::ORB_init (__argc, __argv, orb_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var orb_obj = - the_orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + the_orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var the_root_poa = - PortableServer::POA::_narrow (orb_obj.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (orb_obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var the_poa_manager = - the_root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + the_root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - the_poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + the_poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Initializing the NamingService @@ -75,7 +75,7 @@ spawn_my_orb_thread (void *) ACE_TRY_CHECK; CORBA::String_var ior = - the_orb->object_to_string (orb_servant.in () TAO_ENV_ARG_PARAMETER); + the_orb->object_to_string (orb_servant.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; FILE *output_file = ACE_OS::fopen ("ior.txt", @@ -85,7 +85,7 @@ spawn_my_orb_thread (void *) ior.in ()); ACE_OS::fclose (output_file); - the_orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + the_orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -125,11 +125,11 @@ CServerApp::~CServerApp() CORBA::ORB_init (argc, argv, orb_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; the_shutdown_orb->shutdown (0, // wait_for_completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Thread_Manager::instance ()->wait (); |