diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-10-07 01:59:23 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-10-07 01:59:23 +0000 |
| commit | 3481e7478b336896b0303d157a04fde887b1b4d7 (patch) | |
| tree | debdbc93281d0f0dede4e766364d5c886ee0d23f | |
| parent | 899f22aed52c4b6fb234c479b8aef6703c9fbce1 (diff) | |
| download | ATCD-3481e7478b336896b0303d157a04fde887b1b4d7.tar.gz | |
ChangeLogTag:Tue Oct 6 20:28:10 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog-98c | 11 | ||||
| -rw-r--r-- | TAO/examples/Callback_Quoter/Client_i.cpp | 2 | ||||
| -rw-r--r-- | TAO/examples/Callback_Quoter/MarketFeed_i.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/try_macros.h | 3 |
4 files changed, 13 insertions, 5 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index bade752495d..28c1c7deae2 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,3 +1,14 @@ +Tue Oct 6 20:28:10 1998 Carlos O'Ryan <coryan@cs.wustl.edu> + + * tao/try_macros.h: + The TAO_TRY macro generates a new do/while block even for the + native C++ exception case, this is more consistent with the + alternative mapping. + + * examples/Callback_Quoter/MarketFeed_i.cpp: + * examples/Callback_Quoter/Client_i.cpp: + Removed instantiations of TAO_TRY_ENV because TAO_TRY does it + for us. Tue Oct 6 20:05:55 1998 Kirthika Parameswaran <kirthika@cs.wustl.edu> diff --git a/TAO/examples/Callback_Quoter/Client_i.cpp b/TAO/examples/Callback_Quoter/Client_i.cpp index 9da7f0ed32b..751ba7c91e5 100644 --- a/TAO/examples/Callback_Quoter/Client_i.cpp +++ b/TAO/examples/Callback_Quoter/Client_i.cpp @@ -234,8 +234,6 @@ Client_i::run (void) ACE_DEBUG ((LM_DEBUG, "\n============= Consumer Client! =================\n")); - CORBA::Environment TAO_TRY_ENV; - TAO_TRY { this->consumer_var_ = diff --git a/TAO/examples/Callback_Quoter/MarketFeed_i.cpp b/TAO/examples/Callback_Quoter/MarketFeed_i.cpp index b48a9699acc..2311f20aca8 100644 --- a/TAO/examples/Callback_Quoter/MarketFeed_i.cpp +++ b/TAO/examples/Callback_Quoter/MarketFeed_i.cpp @@ -117,8 +117,6 @@ int MarketFeed_i::send_market_status (const char *stock_name, long value) { - CORBA::Environment TAO_TRY_ENV; - TAO_TRY { // Make the RMI. diff --git a/TAO/tao/try_macros.h b/TAO/tao/try_macros.h index 6b4685ec8cc..81f484dd1c7 100644 --- a/TAO/tao/try_macros.h +++ b/TAO/tao/try_macros.h @@ -27,6 +27,7 @@ // The first "do" scope is for the env. // The second "do" scope is for the TAO_CHECK_ENV continues. #define TAO_TRY \ +do { CORBA_Environment TAO_TRY_ENV; \ try { #define TAO_CATCH(TYPE,VAR) \ @@ -35,7 +36,7 @@ ACE_UNUSED_ARG (VAR); #define TAO_CATCHANY \ } catch (...) { -#define TAO_ENDTRY } +#define TAO_ENDTRY }} while (0) // No need to do checking, exception handling does it for us. #define TAO_CHECK_ENV |