From aeaac79140a9c8f8cd69a33b58578a7f67948771 Mon Sep 17 00:00:00 2001 From: Maksim Smolin Date: Mon, 21 Jan 2019 22:07:10 -0800 Subject: [PATCH] fix IsPowerOfTwo clash in memalloc --- public/tier0/memalloc.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/tier0/memalloc.h b/public/tier0/memalloc.h index 2840d095..9497735c 100644 --- a/public/tier0/memalloc.h +++ b/public/tier0/memalloc.h @@ -178,7 +178,7 @@ inline void *MemAlloc_AllocAligned( size_t size, size_t align ) { unsigned char *pAlloc, *pResult; - if (!IsPowerOfTwo(align)) + if (!ValueIsPowerOfTwo(align)) return NULL; align = (align > sizeof(void *) ? align : sizeof(void *)) - 1; @@ -196,7 +196,7 @@ inline void *MemAlloc_AllocAligned( size_t size, size_t align, const char *pszFi { unsigned char *pAlloc, *pResult; - if (!IsPowerOfTwo(align)) + if (!ValueIsPowerOfTwo(align)) return NULL; align = (align > sizeof(void *) ? align : sizeof(void *)) - 1; @@ -248,7 +248,7 @@ inline void *MemAlloc_AllocAlignedFileLine( size_t size, size_t align, const cha inline void *MemAlloc_ReallocAligned( void *ptr, size_t size, size_t align ) { - if ( !IsPowerOfTwo( align ) ) + if ( !ValueIsPowerOfTwo( align ) ) return NULL; // Don't change alignment between allocation + reallocation.