diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-08-05 17:05:00 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-08-05 17:05:00 +0000 |
| commit | 458fc783ad52fd43082551614560e8a3c7188660 (patch) | |
| tree | 88b0c28890bf52ca75334b1262ec45d4c061acf1 /ace/Malloc_T.cpp | |
| parent | c8adb51f41b2062eed1ac4db6d0a0db4cf14b2a3 (diff) | |
| download | ATCD-458fc783ad52fd43082551614560e8a3c7188660.tar.gz | |
ChangeLogTag:Thu Aug 05 12:01:14 1999 Nanbor Wang <nanbor@cs.wustl.edu>
Diffstat (limited to 'ace/Malloc_T.cpp')
| -rw-r--r-- | ace/Malloc_T.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ace/Malloc_T.cpp b/ace/Malloc_T.cpp index 1638c1810b4..78e33b4e25b 100644 --- a/ace/Malloc_T.cpp +++ b/ace/Malloc_T.cpp @@ -413,11 +413,11 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::shared_free (void *ap) // that addresses are kept in sorted order. for (; - blockp <= currp || blockp >= currp->s_.next_block_; + blockp <= currp || blockp >= ACE_reinterpret_cast (ACE_Malloc_Header*, currp->s_.next_block_); currp = currp->s_.next_block_) { - if (currp >= currp->s_.next_block_ - && (blockp > currp || blockp < currp->s_.next_block_)) + if (currp >= ACE_reinterpret_cast (ACE_Malloc_Header*, currp->s_.next_block_) + && (blockp > currp || blockp < ACE_reinterpret_cast (ACE_Malloc_Header*, currp->s_.next_block_))) // Freed block at the start or the end of the memory pool. break; } @@ -433,7 +433,7 @@ ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK>::shared_free (void *ap) blockp->s_.next_block_ = currp->s_.next_block_; // Join to lower neighbor. - if ((currp + currp->s_.size_) == blockp) + if ((currp + currp->s_.size_) == blockp) { AMS (--this->cb_ptr_->malloc_stats_.nblocks_); currp->s_.size_ += blockp->s_.size_; |