diff options
Diffstat (limited to 'TAO/examples/Simple')
33 files changed, 170 insertions, 170 deletions
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; } } |