From fd83ab71c26234f56b7e8bfb3794c7058b923dcc Mon Sep 17 00:00:00 2001
From: Adam Mitz <mitza@objectcomputing.com>
Date: Fri, 5 Nov 2021 08:44:08 -0500
Subject: Resolve "ambiguous call to overloaded operator" with /std:c++20

---
 ACE/ace/Malloc_T.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'ACE/ace')

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_;
-- 
cgit v1.2.1