Avoid name conflicts with vc++ memory debugger assumptions.

Author: evoskuil

include/bitcoin/node/block_arena.hpp

@@ -61,15 +61,15 @@ class BCN_API block_arena
     }
 
     /// Malloc throws if memory is not allocated.
-    virtual INLINE void* malloc(size_t bytes) THROWS
+    virtual INLINE void* malloc_(size_t bytes) THROWS
     {
         BC_PUSH_WARNING(NO_MALLOC_OR_FREE)
         return std::malloc(bytes);
         BC_POP_WARNING()
     }
 
     /// Free does not throw, behavior is undefined if address is incorrect.
-    virtual INLINE void free(void* address) NOEXCEPT
+    virtual INLINE void free_(void* address) NOEXCEPT
     {
         BC_PUSH_WARNING(NO_MALLOC_OR_FREE)
         std::free(address);

src/block_arena.cpp

@@ -94,7 +94,7 @@ void block_arena::release(void* address) NOEXCEPT
     while (!is_null(address))
     {
         const auto link = get_link(pointer_cast<uint8_t>(address));
-        free(address);
+        free_(address);
         address = link;
     }
 }
@@ -109,7 +109,7 @@ void block_arena::push(size_t minimum) THROWS
     // Ensure next allocation accomodates link plus current request.
     BC_ASSERT(!is_add_overflow(minimum, link_size));
     size_ = std::max(size_, minimum + link_size);
-    const auto map = pointer_cast<uint8_t>(malloc(size_));
+    const auto map = pointer_cast<uint8_t>(malloc_(size_));
 
     if (is_null(map))
         throw allocation_exception{};

test/block_arena.cpp

@@ -94,13 +94,13 @@ class accessor
         return to_aligned(value, align);
     }
 
-    void* malloc(size_t bytes) THROWS override
+    void* malloc_(size_t bytes) THROWS override
     {
         stack.emplace_back(bytes, 0xff_u8);
         return stack.back().data();
     }
 
-    void free(void* address) NOEXCEPT override
+    void free_(void* address) NOEXCEPT override
     {
         freed.push_back(address);
     }
@@ -153,7 +153,7 @@ class accessor_null_malloc
 public:
     using accessor::accessor;
 
-    void* malloc(size_t) THROWS override
+    void* malloc_(size_t) THROWS override
     {
         return nullptr;
     }