diff options
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLog-98c | 7 | ||||
| -rw-r--r-- | TAO/tao/try_macros.h | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index d0aadad65e0..15e938165bb 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,3 +1,10 @@ +Wed Jan 06 13:49:20 1999 Nanbor Wang <nanbor@cs.wustl.edu> + + * tao/try_macros.h: Reverted my previous change about not using + catch (...) on TAO_CATCHANY for debug build. This "feature" is + turned on only when you define TAO_DONT_CATCH_DOT_DOT_DOT. + Thanks to Irfan for persuading me. + Wed Jan 6 13:44:29 1999 Vishal Kachroo <vishal@merengue.cs.wustl.edu> * orbsvcs/Time_Service/Server_i.h (class Server_i): Addded the diff --git a/TAO/tao/try_macros.h b/TAO/tao/try_macros.h index 35bb00ba82e..1d9727f2c8a 100644 --- a/TAO/tao/try_macros.h +++ b/TAO/tao/try_macros.h @@ -49,11 +49,11 @@ // @@ @@ @@ This conditional compilation is meant to be catch abnormal // exceptions so the debugger can catch the exception for us. -#if !defined (ACE_NDEBUG) +#if defined (TAO_DONT_CATCH_DOT_DOT_DOT) #define TAO_CATCHANY TAO_CATCH (TAO_DONT_CATCH, ex) #else #define TAO_CATCHANY } catch (...) { -#endif /* ACE_NDEBUG */ +#endif /* TAO_DONT_CATCH_DOT_DOT_DOT */ #define TAO_ENDTRY }} while (0) |