diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2017-01-03 12:51:05 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2017-01-03 12:51:05 +0100 |
| commit | 6994f54248bacffb4465330e6cc712d50f97762f (patch) | |
| tree | c5059ce571d7775f81be592a722efaab27135474 /TAO/tao | |
| parent | ac3ef746107c421758355199fbf99c14d0b79b77 (diff) | |
| download | ATCD-6994f54248bacffb4465330e6cc712d50f97762f.tar.gz | |
Added ACE_DES_FREE_THIS which doesn't check the pointer for nil because this can't be nil, fixes compiler warnings with newer GCC versions
* ACE/ace/Global_Macros.h:
* ACE/ace/Message_Block.cpp:
* TAO/tao/Asynch_Queued_Message.cpp:
* TAO/tao/Synch_Queued_Message.cpp:
Diffstat (limited to 'TAO/tao')
| -rw-r--r-- | TAO/tao/Asynch_Queued_Message.cpp | 6 | ||||
| -rw-r--r-- | TAO/tao/Synch_Queued_Message.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/TAO/tao/Asynch_Queued_Message.cpp b/TAO/tao/Asynch_Queued_Message.cpp index 268346a6ed2..9f850963aeb 100644 --- a/TAO/tao/Asynch_Queued_Message.cpp +++ b/TAO/tao/Asynch_Queued_Message.cpp @@ -177,9 +177,9 @@ TAO_Asynch_Queued_Message::destroy (void) // pool. if (this->allocator_) { - ACE_DES_FREE (this, - this->allocator_->free, - TAO_Asynch_Queued_Message); + ACE_DES_FREE_THIS (this, + this->allocator_->free, + TAO_Asynch_Queued_Message); } else // global release.. diff --git a/TAO/tao/Synch_Queued_Message.cpp b/TAO/tao/Synch_Queued_Message.cpp index 28f532469e4..d7f2431ac65 100644 --- a/TAO/tao/Synch_Queued_Message.cpp +++ b/TAO/tao/Synch_Queued_Message.cpp @@ -158,9 +158,9 @@ TAO_Synch_Queued_Message::destroy (void) // pool. if (this->allocator_) { - ACE_DES_FREE (this, - this->allocator_->free, - TAO_Synch_Queued_Message); + ACE_DES_FREE_THIS (this, + this->allocator_->free, + TAO_Synch_Queued_Message); } else // global release.. |