diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2017-01-03 16:24:30 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2017-01-03 16:24:30 +0100 |
| commit | db1a461b5c3954552b1cb29b8d86ff977da6cbc1 (patch) | |
| tree | fe6c35f99c846dacff95ef3398b1c24cc7d5d79c | |
| parent | 6994f54248bacffb4465330e6cc712d50f97762f (diff) | |
| download | ATCD-db1a461b5c3954552b1cb29b8d86ff977da6cbc1.tar.gz | |
No need to pass this to ACE_DES_FREE_THIS
* ACE/ace/Global_Macros.h:
* ACE/ace/Message_Block.cpp:
* TAO/tao/Asynch_Queued_Message.cpp:
* TAO/tao/Synch_Queued_Message.cpp:
| -rw-r--r-- | ACE/ace/Global_Macros.h | 6 | ||||
| -rw-r--r-- | ACE/ace/Message_Block.cpp | 6 | ||||
| -rw-r--r-- | TAO/tao/Asynch_Queued_Message.cpp | 3 | ||||
| -rw-r--r-- | TAO/tao/Synch_Queued_Message.cpp | 3 |
4 files changed, 7 insertions, 11 deletions
diff --git a/ACE/ace/Global_Macros.h b/ACE/ace/Global_Macros.h index db852d53a16..f5876f77ec5 100644 --- a/ACE/ace/Global_Macros.h +++ b/ACE/ace/Global_Macros.h @@ -254,10 +254,10 @@ ACE_END_VERSIONED_NAMESPACE_DECL } \ while (0) -# define ACE_DES_FREE_THIS(POINTER,DEALLOCATOR,CLASS) \ +# define ACE_DES_FREE_THIS(DEALLOCATOR,CLASS) \ do { \ - (POINTER)->~CLASS (); \ - DEALLOCATOR (POINTER); \ + this->~CLASS (); \ + DEALLOCATOR (this); \ } \ while (0) diff --git a/ACE/ace/Message_Block.cpp b/ACE/ace/Message_Block.cpp index f1f751c15e7..fca5f105a48 100644 --- a/ACE/ace/Message_Block.cpp +++ b/ACE/ace/Message_Block.cpp @@ -845,8 +845,7 @@ ACE_Data_Block::release (ACE_Lock *lock) // since otherwise we'd be trying to "release" through a deleted // pointer! if (result == 0) - ACE_DES_FREE_THIS (this, - allocator->free, + ACE_DES_FREE_THIS (allocator->free, ACE_Data_Block); return result; } @@ -950,8 +949,7 @@ ACE_Message_Block::release_i (ACE_Lock *lock) else { ACE_Allocator *allocator = this->message_block_allocator_; - ACE_DES_FREE_THIS (this, - allocator->free, + ACE_DES_FREE_THIS (allocator->free, ACE_Message_Block); } diff --git a/TAO/tao/Asynch_Queued_Message.cpp b/TAO/tao/Asynch_Queued_Message.cpp index 9f850963aeb..f79242ceac2 100644 --- a/TAO/tao/Asynch_Queued_Message.cpp +++ b/TAO/tao/Asynch_Queued_Message.cpp @@ -177,8 +177,7 @@ TAO_Asynch_Queued_Message::destroy (void) // pool. if (this->allocator_) { - ACE_DES_FREE_THIS (this, - this->allocator_->free, + ACE_DES_FREE_THIS (this->allocator_->free, TAO_Asynch_Queued_Message); } diff --git a/TAO/tao/Synch_Queued_Message.cpp b/TAO/tao/Synch_Queued_Message.cpp index d7f2431ac65..f4ed2276cec 100644 --- a/TAO/tao/Synch_Queued_Message.cpp +++ b/TAO/tao/Synch_Queued_Message.cpp @@ -158,8 +158,7 @@ TAO_Synch_Queued_Message::destroy (void) // pool. if (this->allocator_) { - ACE_DES_FREE_THIS (this, - this->allocator_->free, + ACE_DES_FREE_THIS (this->allocator_->free, TAO_Synch_Queued_Message); } |