From 984fadf70f7692d8378617d56d0774058797d3a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Tue, 4 Aug 2026 19:19:37 +0800 Subject: [PATCH] Revert "Global: first step to full C++ project" This reverts commit 241ddb79b0460a9aea80e08eafa4dbfbe92b4007. --- src/common/mallocHelper.h | 177 -------------------------------------- 1 file changed, 177 deletions(-) diff --git a/src/common/mallocHelper.h b/src/common/mallocHelper.h index e917fe6bf..e0c182948 100644 --- a/src/common/mallocHelper.h +++ b/src/common/mallocHelper.h @@ -37,180 +37,3 @@ static inline size_t ffMallocUsableSize(const void* ptr) { return 0; // Not supported #endif } - -#if __cplusplus - - #include - #include - - #if defined(_WIN32) - #include - #endif - -[[gnu::always_inline]] -static inline void* ffAlignedAlloc(size_t size, size_t alignment) noexcept { - #if defined(_WIN32) - return _aligned_malloc(size, alignment); - #else - void* ptr = nullptr; - if (posix_memalign(&ptr, alignment, size) == 0) [[likely]] { - return ptr; - } - return nullptr; - #endif -} - -[[gnu::always_inline]] -static inline void ffAlignedFree(void* ptr) noexcept { - #if defined(_WIN32) - _aligned_free(ptr); - #else - ::free(ptr); - #endif -} - -[[gnu::always_inline]] -void* operator new(size_t size) { - if (void* ptr = ::malloc(size)) [[likely]] { - return ptr; - } - std::abort(); -} - -[[gnu::always_inline]] -void operator delete(void* ptr) noexcept { - ::free(ptr); -} - -[[gnu::always_inline]] -void operator delete(void* ptr, size_t size) noexcept { - (void) size; - ::free(ptr); -} - -[[gnu::always_inline]] -void* operator new(size_t size, const std::nothrow_t&) noexcept { - return ::malloc(size); -} - -[[gnu::always_inline]] -void operator delete(void* ptr, const std::nothrow_t&) noexcept { - ::free(ptr); -} - -[[gnu::always_inline]] -void operator delete(void* ptr, size_t size, const std::nothrow_t&) noexcept { - (void) size; - ::free(ptr); -} - -[[gnu::always_inline]] -void* operator new[](size_t size) { - if (void* ptr = ::malloc(size)) [[likely]] { - return ptr; - } - std::abort(); -} - -[[gnu::always_inline]] -void operator delete[](void* ptr) noexcept { - ::free(ptr); -} - -[[gnu::always_inline]] -void operator delete[](void* ptr, size_t size) noexcept { - (void) size; - ::free(ptr); -} - -[[gnu::always_inline]] -void* operator new[](size_t size, const std::nothrow_t&) noexcept { - return ::malloc(size); -} - -[[gnu::always_inline]] -void operator delete[](void* ptr, const std::nothrow_t&) noexcept { - ::free(ptr); -} - -[[gnu::always_inline]] -void operator delete[](void* ptr, size_t size, const std::nothrow_t&) noexcept { - (void) size; - ::free(ptr); -} - - #if __cplusplus >= 201703L // std::align_val_t (over-aligned new/delete, C++17) - -[[gnu::always_inline]] -void* operator new(size_t size, std::align_val_t alignment) { - if (void* ptr = ffAlignedAlloc(size, alignment)) { - return ptr; - } - std::abort(); -} - -[[gnu::always_inline]] -void operator delete(void* ptr, std::align_val_t) noexcept { - ffAlignedFree(ptr); -} - -[[gnu::always_inline]] -void operator delete(void* ptr, size_t size, std::align_val_t) noexcept { - (void) size; - ffAlignedFree(ptr); -} - -[[gnu::always_inline]] -void* operator new(size_t size, std::align_val_t alignment, const std::nothrow_t&) noexcept { - return ffAlignedAlloc(size, static_cast(alignment)); -} - -[[gnu::always_inline]] -void operator delete(void* ptr, std::align_val_t, const std::nothrow_t&) noexcept { - ffAlignedFree(ptr); -} - -[[gnu::always_inline]] -void operator delete(void* ptr, size_t size, std::align_val_t, const std::nothrow_t&) noexcept { - (void) size; - ffAlignedFree(ptr); -} - -[[gnu::always_inline]] -void* operator new[](size_t size, std::align_val_t alignment) { - if (void* ptr = ffAlignedAlloc(size, static_cast(alignment))) { - return ptr; - } - std::abort(); -} - -[[gnu::always_inline]] -void operator delete[](void* ptr, std::align_val_t) noexcept { - ffAlignedFree(ptr); -} - -[[gnu::always_inline]] -void operator delete[](void* ptr, size_t size, std::align_val_t) noexcept { - (void) size; - ffAlignedFree(ptr); -} - -[[gnu::always_inline]] -void* operator new[](size_t size, std::align_val_t alignment, const std::nothrow_t&) noexcept { - return ffAlignedAlloc(size, static_cast(alignment)); -} - -[[gnu::always_inline]] -void operator delete[](void* ptr, std::align_val_t, const std::nothrow_t&) noexcept { - ffAlignedFree(ptr); -} - -[[gnu::always_inline]] -void operator delete[](void* ptr, size_t size, std::align_val_t, const std::nothrow_t&) noexcept { - (void) size; - ffAlignedFree(ptr); -} - - #endif // __cplusplus >= 201703L - -#endif