summaryrefslogtreecommitdiff
path: root/TAO/tao
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>1998-03-23 00:04:29 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>1998-03-23 00:04:29 +0000
commit9c5e4a92f1045444d0367d4c6b93dd9e35722d98 (patch)
tree4ca5fcf00ff8920219949c5cc0b7d299bb128b4a /TAO/tao
parent1ab8190966a253fcf57273e118cedbc50854587a (diff)
downloadATCD-9c5e4a92f1045444d0367d4c6b93dd9e35722d98.tar.gz
*** empty log message ***
Diffstat (limited to 'TAO/tao')
-rw-r--r--TAO/tao/Exception.i12
1 files changed, 1 insertions, 11 deletions
diff --git a/TAO/tao/Exception.i b/TAO/tao/Exception.i
index a10334f5472..575e97ef34b 100644
--- a/TAO/tao/Exception.i
+++ b/TAO/tao/Exception.i
@@ -37,21 +37,11 @@ CORBA_SystemException::completion (CORBA::CompletionStatus c)
this->completed_ = c;
}
-ACE_INLINE
-<<<<<<< Exception.i
-=======
-CORBA_Environment::CORBA_Environment (void)
- : exception_ (0)
-{
-}
-
ACE_INLINE void
CORBA_Environment::clear (void)
{
if (this->exception_)
- {
- this->exception_->Release ();
- }
+ this->exception_->Release ();
this->exception_ = 0;
}