diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-01-06 20:05:11 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-01-06 20:05:11 +0000 |
| commit | 89db5e7887f6524e230f59f30346ace11a8b9f1d (patch) | |
| tree | e86cc8be6644f43a87b2e6bb1fa4a3c0db337043 | |
| parent | 7db690747b11bf04dd73f070848e319d9893c009 (diff) | |
| download | ATCD-89db5e7887f6524e230f59f30346ace11a8b9f1d.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/ChangeLog-98c | 3 | ||||
| -rw-r--r-- | TAO/tao/Exception.cpp | 4 | ||||
| -rw-r--r-- | TAO/tao/Exception.h | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index 15e938165bb..01311bfe607 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,5 +1,6 @@ -Wed Jan 06 13:49:20 1999 Nanbor Wang <nanbor@cs.wustl.edu> +Wed Jan 06 14:07:15 1999 Nanbor Wang <nanbor@cs.wustl.edu> + * tao/Exception.{h,cpp} (TAO_DONT_CATCH): * 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. diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp index 4e611fda6c4..1d25db38d41 100644 --- a/TAO/tao/Exception.cpp +++ b/TAO/tao/Exception.cpp @@ -606,10 +606,10 @@ CORBA_ExceptionList::remove (CORBA::ULong index, CORBA::Environment &env) env.clear (); } -#if !defined (ACE_NDEBUG) +#if defined (TAO_DONT_CATCH_DOT_DOT_DOT) TAO_DONT_CATCH::TAO_DONT_CATCH () {} -#endif /* ! ACE_NDEBUG */ +#endif /* TAO_DONT_CATCH_DOT_DOT_DOT */ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Node<CORBA::TypeCode_ptr>; diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h index d1d577eeb7f..7f81030446b 100644 --- a/TAO/tao/Exception.h +++ b/TAO/tao/Exception.h @@ -337,7 +337,7 @@ private: // internal list of typecodes }; -#if !defined (ACE_NDEBUG) +#if defined (TAO_DONT_CATCH_DOT_DOT_DOT) class TAO_Export TAO_DONT_CATCH // This class is only used internally in TAO as an exception // that never gets thrown. Never use this class anywhere. @@ -345,7 +345,7 @@ class TAO_Export TAO_DONT_CATCH public: TAO_DONT_CATCH (); }; -#endif /* ! ACE_NDEBUG */ +#endif /* TAO_DONT_CATCH_DOT_DOT_DOT */ #if defined (__ACE_INLINE__) # include "tao/Exception.i" |