diff options
author | harrison <harrison@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1996-11-13 09:22:20 +0000 |
---|---|---|
committer | harrison <harrison@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1996-11-13 09:22:20 +0000 |
commit | a9d730d57e2630ed3b3d4488f039dac33c771db7 (patch) | |
tree | d9861c4ca3de2de68511f167be7d02a8093c849b /ace/Message_Block.cpp | |
parent | 0ae37fde11b526d388cdd62dafa4f0503802b349 (diff) | |
download | ATCD-a9d730d57e2630ed3b3d4488f039dac33c771db7.tar.gz |
Check the ChangeLog for details.
Diffstat (limited to 'ace/Message_Block.cpp')
-rw-r--r-- | ace/Message_Block.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ace/Message_Block.cpp b/ace/Message_Block.cpp index c8266dae728..96e94d460ae 100644 --- a/ace/Message_Block.cpp +++ b/ace/Message_Block.cpp @@ -178,22 +178,22 @@ ACE_Message_Block::init (size_t sz, ACE_Message_Type msg_type, ACE_Message_Block *msg_cont, const char *msg_data, - ACE_Allocator *allocator) + ACE_Allocator *alloc) { ACE_TRACE ("ACE_Message_Block::init"); this->flags_ = 0; if (msg_data == 0) { - if (allocator == 0) + if (alloc == 0) { this->allocator_ = 0; ACE_NEW_RETURN (this->base_, char[sz], -1); } else // Use the allocator! { - this->allocator_ = allocator; - this->base_ = (char *) allocator->malloc (sz); + this->allocator_ = alloc; + this->base_ = (char *) alloc->malloc (sz); if (this->base_ == 0) { errno = ENOMEM; |