diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-08-09 02:30:42 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-08-09 02:30:42 +0000 |
| commit | cc5f1e3517ca21190a71f49aa192b7550c551788 (patch) | |
| tree | 9a3fc550d4676fc44cd94d00be1993c73ab5e32c | |
| parent | 268274112d0b69ee9f76047e679b8905142cb376 (diff) | |
| download | ATCD-cc5f1e3517ca21190a71f49aa192b7550c551788.tar.gz | |
ChangeLogTag:Sat Aug 8 21:28:33 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog-98c | 7 | ||||
| -rw-r--r-- | TAO/tao/Exception.cpp | 12 | ||||
| -rw-r--r-- | TAO/tao/Exception.h | 5 | ||||
| -rw-r--r-- | TAO/tao/Exception.i | 7 |
4 files changed, 7 insertions, 24 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index cf22bc0a7b8..ff731df1cc5 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,3 +1,10 @@ +Sat Aug 8 21:28:33 1998 Carlos O'Ryan <coryan@cs.wustl.edu> + + * tao/Exception.h: + * tao/Exception.i: + * tao/Exception.cpp: + Removed superflous operator new and operator delete. + Fri Aug 7 21:39:26 1998 Carlos O'Ryan <coryan@cs.wustl.edu> * docs/releasenotes/TODO.html: diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp index 72cb536bfb7..bb8ca578a65 100644 --- a/TAO/tao/Exception.cpp +++ b/TAO/tao/Exception.cpp @@ -48,23 +48,11 @@ CORBA_Environment::clear (void) this->exception_ = 0; } -void -CORBA_Exception::operator delete (void *p) -{ - ::operator delete (p); -} - CORBA_Environment::CORBA_Environment (void) : exception_ (0) { } -void * -CORBA_Exception::operator new (size_t s) -{ - return ::operator new (s); -} - CORBA_Exception::CORBA_Exception (CORBA::TypeCode_ptr tc) : type_ (CORBA::TypeCode::_duplicate (tc)), refcount_ (0) diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h index 88b5fd2d0ab..e3f8d2bb37c 100644 --- a/TAO/tao/Exception.h +++ b/TAO/tao/Exception.h @@ -43,11 +43,6 @@ public: virtual ~CORBA_Exception (void); // destructor - // = Memory allocators. - void *operator new (size_t, const void *p); - void *operator new (size_t s); - void operator delete (void *p); - // these are extensions CORBA_Exception (CORBA::TypeCode_ptr type); diff --git a/TAO/tao/Exception.i b/TAO/tao/Exception.i index 368249a8f9d..02dc5444c33 100644 --- a/TAO/tao/Exception.i +++ b/TAO/tao/Exception.i @@ -1,13 +1,6 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ -ACE_INLINE void * -CORBA_Exception::operator new (size_t, - const void *p) -{ - return (void *) p; -} - ACE_INLINE CORBA_UserException::CORBA_UserException (const CORBA_UserException &src) : CORBA_Exception (src) |