diff options
Diffstat (limited to 'TAO/examples/Simple/bank/Bank_Client_i.cpp')
| -rw-r--r-- | TAO/examples/Simple/bank/Bank_Client_i.cpp | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/TAO/examples/Simple/bank/Bank_Client_i.cpp b/TAO/examples/Simple/bank/Bank_Client_i.cpp index a26d169690c..fa5c5974368 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 (ACE_TRY_ENV); + client->shutdown (TAO_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 (ACE_TRY_ENV); + this->test_for_same_name (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "\nTests for account with different names\n")); - this->test_for_different_name (ACE_TRY_ENV); + this->test_for_different_name (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "\nTests for overdrafts\n")); - this->test_for_overdraft (ACE_TRY_ENV); + this->test_for_overdraft (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -78,33 +78,33 @@ Bank_Client_i::check_accounts (void ) // a same name can be opened void -Bank_Client_i::test_for_same_name (CORBA::Environment &ACE_TRY_ENV) +Bank_Client_i::test_for_same_name (TAO_ENV_SINGLE_ARG_DECL) { const char *name = "Name"; CORBA::Float initial_bal = 0.00; Bank::Account_var acct_id1 = client->open (name, - initial_bal, - ACE_TRY_ENV); + initial_bal + TAO_ENV_ARG_PARAMETER); Bank::Account_var acct_id2 = client->open (name, - initial_bal, - ACE_TRY_ENV); + initial_bal + TAO_ENV_ARG_PARAMETER); ACE_ASSERT (acct_id1->_is_equivalent ((CORBA::Object *) acct_id2.in ()) != 0); - client->close (acct_id1.in (), - ACE_TRY_ENV); + client->close (acct_id1.in () + TAO_ENV_ARG_PARAMETER); - client->close (acct_id2.in (), - ACE_TRY_ENV); + client->close (acct_id2.in () + TAO_ENV_ARG_PARAMETER); } // This method tests whether an account with different names can be opened void -Bank_Client_i::test_for_different_name (CORBA::Environment &ACE_TRY_ENV) +Bank_Client_i::test_for_different_name (TAO_ENV_SINGLE_ARG_DECL) { const char *name1 = "Name1"; const char *name2 = "Name2"; @@ -112,40 +112,40 @@ Bank_Client_i::test_for_different_name (CORBA::Environment &ACE_TRY_ENV) CORBA::Float initial_bal = 0.0; Bank::Account_var acct_id1 = client->open (name1, - initial_bal, - ACE_TRY_ENV); + initial_bal + TAO_ENV_ARG_PARAMETER); Bank::Account_var acct_id2 = client->open (name2, - initial_bal, - ACE_TRY_ENV); + initial_bal + TAO_ENV_ARG_PARAMETER); ACE_ASSERT (acct_id1->_is_equivalent ((CORBA::Object *)acct_id2.in ()) == 0); - client->close (acct_id1.in (), - ACE_TRY_ENV); + client->close (acct_id1.in () + TAO_ENV_ARG_PARAMETER); - client->close (acct_id2.in (), - ACE_TRY_ENV); + client->close (acct_id2.in () + TAO_ENV_ARG_PARAMETER); } // This method tests the Overdraft exception. void -Bank_Client_i::test_for_overdraft (CORBA::Environment &ACE_TRY_ENV) +Bank_Client_i::test_for_overdraft (TAO_ENV_SINGLE_ARG_DECL) { CORBA::Float initial_bal = 100.0; const char *name = "Name"; - Bank::Account_var acct_id = client->open (name, initial_bal, ACE_TRY_ENV); + Bank::Account_var acct_id = client->open (name, initial_bal TAO_ENV_ARG_PARAMETER); ACE_CHECK; - acct_id->deposit (100.00, ACE_TRY_ENV); + acct_id->deposit (100.00 TAO_ENV_ARG_PARAMETER); ACE_CHECK; - - CORBA::Float bal = acct_id->balance (ACE_TRY_ENV); + + CORBA::Float bal = acct_id->balance (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; acct_id->withdraw (bal + 20); - client->close (acct_id.in (), ACE_TRY_ENV); + client->close (acct_id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } |