From 5b5afe2b4a170aa6a7a3d5863a74c10e05f75d43 Mon Sep 17 00:00:00 2001 From: def Date: Thu, 4 Nov 2021 10:50:39 +0100 Subject: [PATCH] GET_SIZE -> MACRO_ALLOC_GET_SIZE --- src/game/server/alloc.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/game/server/alloc.h b/src/game/server/alloc.h index c1926feb7..bbf2c3306 100644 --- a/src/game/server/alloc.h +++ b/src/game/server/alloc.h @@ -42,13 +42,13 @@ public: \ private: #if __has_feature(address_sanitizer) -#define GET_SIZE(POOLTYPE) ((sizeof(POOLTYPE) + 7) & ~7) +#define MACRO_ALLOC_GET_SIZE(POOLTYPE) ((sizeof(POOLTYPE) + 7) & ~7) #else -#define GET_SIZE(POOLTYPE) (sizeof(POOLTYPE)) +#define MACRO_ALLOC_GET_SIZE(POOLTYPE) (sizeof(POOLTYPE)) #endif #define MACRO_ALLOC_POOL_ID_IMPL(POOLTYPE, PoolSize) \ - static char ms_PoolData##POOLTYPE[PoolSize][GET_SIZE(POOLTYPE)] = {{0}}; \ + static char ms_PoolData##POOLTYPE[PoolSize][MACRO_ALLOC_GET_SIZE(POOLTYPE)] = {{0}}; \ static int ms_PoolUsed##POOLTYPE[PoolSize] = {0}; \ [[maybe_unused]] static int ms_PoolDummy##POOLTYPE = (ASAN_POISON_MEMORY_REGION(ms_PoolData##POOLTYPE, sizeof(ms_PoolData##POOLTYPE)), 0); \ void *POOLTYPE::operator new(size_t Size, int id) \