Merge pull request #725 from evoskuil/master

evoskuil · web-flow · commit ba7fe2ded0b9 · 2025-01-31T03:57:39.000-05:00
Avoid name conflicts with vc++ memory debugger assumptions.
diff --git a/builds/msvc/vs2022/libbitcoin-system.import.props b/builds/msvc/vs2022/libbitcoin-system.import.props
@@ -51,8 +51,7 @@
       <!-- WIN32_LEAN_AND_MEAN avoids inclusion of certain headers, winsock.h conflicts with boost and protocol use of winsock2.h. -->
       <PreprocessorDefinitions>WITH_ICU;WIN32_LEAN_AND_MEAN;NOMINMAX;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Linkage-libbitcoin-system)' == 'static' Or '$(Linkage-libbitcoin-system)' == 'ltcg'">BC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile>
+      <PreprocessorDefinitions Condition="$(Configuration.IndexOf('Debug')) != -1">_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <!-- Enable use of CPU intrinsics. -->
       <PreprocessorDefinitions Condition="'$(Option-avx512)' == 'true'">WITH_AVX512;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Option-avx2)'   == 'true'">WITH_AVX2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/console/executor.cpp b/console/executor.cpp
@@ -22,7 +22,6 @@
 #include <algorithm>
 #include <atomic>
 #include <csignal>
-#include <functional>
 #include <future>
 #include <iostream>
 #include <map>
diff --git a/console/executor_commands.cpp b/console/executor_commands.cpp
@@ -22,7 +22,6 @@
 #include <algorithm>
 #include <atomic>
 #include <csignal>
-#include <functional>
 #include <future>
 #include <iostream>
 #include <map>
diff --git a/console/executor_dumps.cpp b/console/executor_dumps.cpp
@@ -22,7 +22,6 @@
 #include <algorithm>
 #include <atomic>
 #include <csignal>
-#include <functional>
 #include <future>
 #include <iostream>
 #include <map>
diff --git a/console/executor_events.cpp b/console/executor_events.cpp
@@ -22,7 +22,6 @@
 #include <algorithm>
 #include <atomic>
 #include <csignal>
-#include <functional>
 #include <future>
 #include <iostream>
 #include <map>
diff --git a/console/executor_logging.cpp b/console/executor_logging.cpp
@@ -22,7 +22,6 @@
 #include <algorithm>
 #include <atomic>
 #include <csignal>
-#include <functional>
 #include <future>
 #include <iostream>
 #include <map>
diff --git a/console/executor_options.cpp b/console/executor_options.cpp
@@ -22,7 +22,6 @@
 #include <algorithm>
 #include <atomic>
 #include <csignal>
-#include <functional>
 #include <future>
 #include <iostream>
 #include <map>
diff --git a/console/executor_runner.cpp b/console/executor_runner.cpp
@@ -22,7 +22,6 @@
 #include <algorithm>
 #include <atomic>
 #include <csignal>
-#include <functional>
 #include <future>
 #include <iostream>
 #include <map>
diff --git a/console/executor_scans.cpp b/console/executor_scans.cpp
@@ -22,7 +22,6 @@
 #include <algorithm>
 #include <atomic>
 #include <csignal>
-#include <functional>
 #include <future>
 #include <iostream>
 #include <map>
diff --git a/console/executor_store.cpp b/console/executor_store.cpp
@@ -22,7 +22,6 @@
 #include <algorithm>
 #include <atomic>
 #include <csignal>
-#include <functional>
 #include <future>
 #include <iostream>
 #include <map>
diff --git a/console/executor_test_reader.cpp b/console/executor_test_reader.cpp
@@ -22,7 +22,6 @@
 #include <algorithm>
 #include <atomic>
 #include <csignal>
-#include <functional>
 #include <future>
 #include <iostream>
 #include <map>
diff --git a/console/executor_test_writer.cpp b/console/executor_test_writer.cpp
@@ -22,7 +22,6 @@
 #include <algorithm>
 #include <atomic>
 #include <csignal>
-#include <functional>
 #include <future>
 #include <iostream>
 #include <map>
diff --git a/console/stack_trace.cpp b/console/stack_trace.cpp
@@ -26,7 +26,6 @@
 #include <algorithm>
 #include <exception>
 #include <iterator>
-#include <memory>
 #include <new>
 #include <sstream>
 
diff --git a/include/bitcoin/node/block_arena.hpp b/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 ALLOCATOR 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);
diff --git a/include/bitcoin/node/chasers/chaser_check.hpp b/include/bitcoin/node/chasers/chaser_check.hpp
@@ -20,7 +20,6 @@
 #define LIBBITCOIN_NODE_CHASERS_CHASER_CHECK_HPP
 
 #include <deque>
-#include <memory>
 #include <bitcoin/network.hpp>
 #include <bitcoin/node/chasers/chaser.hpp>
 #include <bitcoin/node/define.hpp>
diff --git a/include/bitcoin/node/sessions/session.hpp b/include/bitcoin/node/sessions/session.hpp
@@ -19,7 +19,6 @@
 #ifndef LIBBITCOIN_NODE_SESSIONS_SESSION_HPP
 #define LIBBITCOIN_NODE_SESSIONS_SESSION_HPP
 
-#include <memory>
 #include <bitcoin/database.hpp>
 #include <bitcoin/network.hpp>
 #include <bitcoin/node/define.hpp>
diff --git a/src/block_arena.cpp b/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{};
diff --git a/src/block_memory.cpp b/src/block_memory.cpp
@@ -19,7 +19,6 @@
 #include <bitcoin/node/block_memory.hpp>
 
 #include <atomic>
-#include <memory>
 #include <bitcoin/system.hpp>
 
 namespace libbitcoin {
diff --git a/src/chasers/chaser_check.cpp b/src/chasers/chaser_check.cpp
@@ -19,7 +19,6 @@
 #include <bitcoin/node/chasers/chaser_check.hpp>
 
 #include <algorithm>
-#include <functional>
 #include <memory>
 #include <bitcoin/database.hpp>
 #include <bitcoin/network.hpp>
diff --git a/src/chasers/chaser_confirm.cpp b/src/chasers/chaser_confirm.cpp
@@ -18,9 +18,7 @@
  */
 #include <bitcoin/node/chasers/chaser_confirm.hpp>
 
-#include <functional>
 #include <ranges>
-#include <utility>
 #include <bitcoin/database.hpp>
 #include <bitcoin/network.hpp>
 #include <bitcoin/node/chasers/chaser.hpp>
diff --git a/src/chasers/chaser_storage.cpp b/src/chasers/chaser_storage.cpp
@@ -18,7 +18,6 @@
  */
 #include <bitcoin/node/chasers/chaser_storage.hpp>
 
-#include <memory>
 #include <bitcoin/system.hpp>
 #include <bitcoin/node/chasers/chaser.hpp>
 #include <bitcoin/node/define.hpp>
diff --git a/src/chasers/chaser_validate.cpp b/src/chasers/chaser_validate.cpp
@@ -18,8 +18,6 @@
  */
 #include <bitcoin/node/chasers/chaser_validate.hpp>
 
-#include <functional>
-#include <memory>
 #include <bitcoin/system.hpp>
 #include <bitcoin/node/chasers/chaser.hpp>
 #include <bitcoin/node/define.hpp>
diff --git a/src/full_node.cpp b/src/full_node.cpp
@@ -18,8 +18,6 @@
  */
 #include <bitcoin/node/full_node.hpp>
 
-#include <functional>
-#include <utility>
 #include <bitcoin/database.hpp>
 #include <bitcoin/network.hpp>
 #include <bitcoin/node/chasers/chasers.hpp>
diff --git a/src/protocols/protocol.cpp b/src/protocols/protocol.cpp
@@ -18,7 +18,6 @@
  */
 #include <bitcoin/node/protocols/protocol.hpp>
 
-#include <utility>
 #include <bitcoin/database.hpp>
 #include <bitcoin/network.hpp>
 #include <bitcoin/node/configuration.hpp>
diff --git a/src/sessions/session.cpp b/src/sessions/session.cpp
@@ -18,8 +18,6 @@
  */
 #include <bitcoin/node/sessions/session.hpp>
 
-#include <functional>
-#include <utility>
 #include <bitcoin/database.hpp>
 #include <bitcoin/network.hpp>
 #include <bitcoin/node/configuration.hpp>
diff --git a/test/block_arena.cpp b/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;
     }
diff --git a/test/test.hpp b/test/test.hpp
@@ -21,7 +21,6 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include <array>
 #include <iostream>
 #include <vector>
 #include <filesystem>
