From 40576a64a378e64805213401725b33615720e105 Mon Sep 17 00:00:00 2001 From: cinnaboot Date: Tue, 14 Dec 2021 11:07:43 -0500 Subject: [PATCH] update ARENA_ALLOC macro args --- src/asset.cpp | 2 +- src/asset.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/asset.cpp b/src/asset.cpp index 5af21d7..cb98729 100644 --- a/src/asset.cpp +++ b/src/asset.cpp @@ -75,7 +75,7 @@ arenaCopyCStr(memory_arena* arena, const char* input, u32 max_len) { u32 name_len = std::strlen(input) + 1; assert(name_len < max_len); - char* out = ARENA_ALLOC(arena, name_len, char); + char* out = ARENA_ALLOC(arena, char, name_len); std::strncpy(out, input, name_len); return out; } diff --git a/src/asset.h b/src/asset.h index cd53607..c6beb4e 100644 --- a/src/asset.h +++ b/src/asset.h @@ -33,7 +33,8 @@ void arenaFree(memory_arena*& arena); uint arenaGetFreeSize(memory_arena* arena); -#define ARENA_ALLOC(arena, len, type) (type*) arenaAllocateBlock(arena, len) +#define ARENA_ALLOC(arena, type, count) \ + (type*) arenaAllocateBlock(arena, sizeof(type) * count) void* arenaAllocateBlock(memory_arena* arena, size_t block_size); #define MAX_NAME_LENGTH 256