diff options
| -rw-r--r-- | TAO/ChangeLog-99c | 5 | ||||
| -rw-r--r-- | TAO/docs/exceptions.html | 2 | ||||
| -rw-r--r-- | TAO/tao/try_macros.h | 5 |
3 files changed, 5 insertions, 7 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index f8ac251d4db..3b3d8d0bf36 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,9 +1,8 @@ Mon Jan 11 00:53:13 1999 Nanbor Wang <nanbor@cs.wustl.edu> * tao/try_macros.h (TAO_CATCHALL): For compilers without c++ - exceptions, simply make it identical to TAO_CATCHANY. Same - exception won't get caught the second time and it is effectively - an no-op. Thanks, to Irfan for suggesting the change. + exceptions, simply make it identical to TAO_CATCHANY. Thanks, + to Irfan for suggesting the change. Sun Jan 10 22:43:06 1999 Nanbor Wang <nanbor@cs.wustl.edu> diff --git a/TAO/docs/exceptions.html b/TAO/docs/exceptions.html index c1a11d24380..5b2cc49358a 100644 --- a/TAO/docs/exceptions.html +++ b/TAO/docs/exceptions.html @@ -275,6 +275,8 @@ definitions of macros discussed here. <h2>TO-DO</h2> <ol> <li>Automatic rethrow simpulated exceptions if not caught? + <li>must check if the same exception can be caught twice on + compilers without c++ exceptions. </ol> <h3>General Guidelines of Exceptions</h3> diff --git a/TAO/tao/try_macros.h b/TAO/tao/try_macros.h index 9b4c326528c..9da7408f0d1 100644 --- a/TAO/tao/try_macros.h +++ b/TAO/tao/try_macros.h @@ -186,10 +186,7 @@ if (TAO_TRY_ENV.exception () != 0 && \ TYPE &VAR = *TYPE::_narrow (TAO_TRY_ENV.exception ()); \ ACE_UNUSED_ARG (VAR); -#define TAO_CATCHALL \ -} while (0); \ -do { \ -continue; +#define TAO_CATCHALL TAO_CATCH(CORBA_Exception, ex) // The first "while" closes the local scope. The second "while" // closes the TAO_TRY_ENV scope. |