diff --git a/include/fmt/format.h b/include/fmt/format.h index c3a1bda0..a10470f2 100644 --- a/include/fmt/format.h +++ b/include/fmt/format.h @@ -41,10 +41,11 @@ #include "base.h" #ifndef FMT_MODULE +# include // malloc, free + # include // std::signbit # include // std::byte # include // uint32_t -# include // std::malloc, std::free # include // std::memcpy # include // std::numeric_limits # include // std::bad_alloc @@ -744,12 +745,12 @@ template struct allocator : private std::decay { auto allocate(size_t n) -> T* { FMT_ASSERT(n <= max_value() / sizeof(T), ""); - T* p = static_cast(std::malloc(n * sizeof(T))); + T* p = static_cast(malloc(n * sizeof(T))); if (!p) FMT_THROW(std::bad_alloc()); return p; } - void deallocate(T* p, size_t) { std::free(p); } + void deallocate(T* p, size_t) { free(p); } constexpr friend auto operator==(allocator, allocator) noexcept -> bool { return true; // All instances of this allocator are equivalent. diff --git a/include/fmt/std.h b/include/fmt/std.h index 0cc0066e..f12f14df 100644 --- a/include/fmt/std.h +++ b/include/fmt/std.h @@ -198,7 +198,7 @@ auto write_demangled_name(OutputIt out, const std::type_info& ti) -> OutputIt { int status = 0; size_t size = 0; std::unique_ptr demangled_name_ptr( - abi::__cxa_demangle(ti.name(), nullptr, &size, &status), &std::free); + abi::__cxa_demangle(ti.name(), nullptr, &size, &status), &free); string_view demangled_name_view; if (demangled_name_ptr) {