diff options
Diffstat (limited to 'TAO/examples/Simple/bank')
| -rw-r--r-- | TAO/examples/Simple/bank/AccountManager_i.cpp | 8 | ||||
| -rw-r--r-- | TAO/examples/Simple/bank/AccountManager_i.h | 6 | ||||
| -rw-r--r-- | TAO/examples/Simple/bank/Account_i.cpp | 10 | ||||
| -rw-r--r-- | TAO/examples/Simple/bank/Account_i.h | 10 | ||||
| -rw-r--r-- | TAO/examples/Simple/bank/Bank_Client_i.cpp | 38 | ||||
| -rw-r--r-- | TAO/examples/Simple/bank/Bank_Client_i.h | 14 | ||||
| -rw-r--r-- | TAO/examples/Simple/bank/server.cpp | 4 |
7 files changed, 45 insertions, 45 deletions
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; } } |