From eefc9e49c52d667bc3cc73fca228e0c2c4d5bcaf Mon Sep 17 00:00:00 2001 From: David Chisnall Date: Fri, 5 Jul 2019 11:15:38 +0100 Subject: [PATCH] Fix some duplicate inline warnings. --- src/mem/alloc.h | 2 +- src/mem/threadalloc.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mem/alloc.h b/src/mem/alloc.h index c7dac3c..f5f3fe3 100644 --- a/src/mem/alloc.h +++ b/src/mem/alloc.h @@ -234,7 +234,7 @@ namespace snmalloc FastFreeLists() : small_fast_free_lists() {} }; - ALWAYSINLINE inline void* no_replacement(void*) + SNMALLOC_FAST_PATH void* no_replacement(void*) { return nullptr; } diff --git a/src/mem/threadalloc.h b/src/mem/threadalloc.h index 461172e..ede455d 100644 --- a/src/mem/threadalloc.h +++ b/src/mem/threadalloc.h @@ -326,7 +326,7 @@ namespace snmalloc * so. If we have not allocated a per-thread allocator yet, then this * function will allocate one. */ - ALWAYSINLINE inline void* lazy_replacement(void* existing) + ALWAYSINLINE void* lazy_replacement(void* existing) { if (existing != &GlobalPlaceHolder) {