diff options
author | Adam Mitz <mitza@objectcomputing.com> | 2021-11-05 08:44:08 -0500 |
---|---|---|
committer | Adam Mitz <mitza@objectcomputing.com> | 2021-11-05 08:44:08 -0500 |
commit | fd83ab71c26234f56b7e8bfb3794c7058b923dcc (patch) | |
tree | d681744f4a14c4c14935122433cbdcce32ee1dc1 /ACE/ace | |
parent | 0e2c9d980d009ace54e08a2da3ab2d57d48b5596 (diff) | |
download | ATCD-fd83ab71c26234f56b7e8bfb3794c7058b923dcc.tar.gz |
Resolve "ambiguous call to overloaded operator" with /std:c++20
Diffstat (limited to 'ACE/ace')
-rw-r--r-- | ACE/ace/Malloc_T.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ACE/ace/Malloc_T.cpp b/ACE/ace/Malloc_T.cpp index ff8d6563db0..3d6a11a61cc 100644 --- a/ACE/ace/Malloc_T.cpp +++ b/ACE/ace/Malloc_T.cpp @@ -682,7 +682,7 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::shared_malloc (size_t nbytes) // Skip over the MALLOC_HEADER when returning pointer. return currp + 1; } - else if (currp == this->cb_ptr_->freep_) + else if (currp == static_cast<MALLOC_HEADER *> (this->cb_ptr_->freep_)) { // We've wrapped around freelist without finding a // block. Therefore, we need to ask the memory pool for @@ -808,7 +808,7 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::shared_free (void *ap) } // Join to upper neighbor. - if ((blockp + blockp->size_) == currp->next_block_) + if (blockp + blockp->size_ == static_cast<MALLOC_HEADER *> (currp->next_block_)) { ACE_MALLOC_STATS (--this->cb_ptr_->malloc_stats_.nblocks_); blockp->size_ += currp->next_block_->size_; |