diff options
| author | Tohei Ichikawa <ichikawa.tohei.desu@gmail.com> | 2025-09-24 21:09:31 -0400 |
|---|---|---|
| committer | Tohei Ichikawa <ichikawa.tohei.desu@gmail.com> | 2025-09-24 21:09:31 -0400 |
| commit | 6ed9351955a8996418a8da10cd7b0da179734095 (patch) | |
| tree | 1ddd4476a5b9d2af23f3240eaf31e7bfe28df9f1 /src/common_memory.cpp | |
| parent | 3c1238991ba6f68f4ea31ca8ed368387821fa7d7 (diff) | |
| parent | 5d3092bf2d00a46311a5f785658f04c823a9f3fa (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/common_memory.cpp')
| -rw-r--r-- | src/common_memory.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/common_memory.cpp b/src/common_memory.cpp index 0b95e1242..addd43687 100644 --- a/src/common_memory.cpp +++ b/src/common_memory.cpp @@ -481,15 +481,16 @@ gb_internal gbAllocator permanent_allocator() { } gb_internal gbAllocator temporary_allocator() { - return {thread_arena_allocator_proc, cast(void *)cast(uintptr)ThreadArena_Permanent}; + // return {thread_arena_allocator_proc, cast(void *)cast(uintptr)ThreadArena_Temporary}; + return permanent_allocator(); } #define TEMP_ARENA_GUARD(arena) ArenaTempGuard GB_DEFER_3(_arena_guard_){arena} -// #define TEMPORARY_ALLOCATOR_GUARD() -#define TEMPORARY_ALLOCATOR_GUARD() TEMP_ARENA_GUARD(get_arena(ThreadArena_Temporary)) +// #define TEMPORARY_ALLOCATOR_GUARD() TEMP_ARENA_GUARD(get_arena(ThreadArena_Temporary)) +#define TEMPORARY_ALLOCATOR_GUARD() #define PERMANENT_ALLOCATOR_GUARD() |