diff --git a/core/memory/arena.cpp b/core/memory/arena.cpp index 46e7025..da21688 100644 --- a/core/memory/arena.cpp +++ b/core/memory/arena.cpp @@ -4,7 +4,8 @@ #include #endif -memory::arena_t memory::arena_init(size_t capacity) +namespace pound::memory { +arena_t arena_init(size_t capacity) { // TODO(GloriousTaco:memory): Replace malloc with a windows memory mapping API. @@ -28,7 +29,7 @@ memory::arena_t memory::arena_init(size_t capacity) } // new more memsafe code (ownedbywuigi) (i give up on windows compatibility for now, will stick to the old unsafe code) -const void* memory::arena_allocate(memory::arena_t* arena, const std::size_t size) +const void* arena_allocate(memory::arena_t* arena, const std::size_t size) { ASSERT(arena != nullptr); ASSERT(arena->size + size <= arena->capacity); @@ -36,14 +37,14 @@ const void* memory::arena_allocate(memory::arena_t* arena, const std::size_t siz arena->size += size; return data; } -void memory::arena_reset(memory::arena_t* arena) +void arena_reset(memory::arena_t* arena) { ASSERT(nullptr != arena); ASSERT(nullptr != arena->data); arena->size = 0; (void)std::memset(arena->data, POISON_PATTERN, arena->capacity); } -void memory::arena_free(memory::arena_t* arena) +void arena_free(memory::arena_t* arena) { ASSERT(arena != nullptr); arena->capacity = 0; @@ -51,3 +52,4 @@ void memory::arena_free(memory::arena_t* arena) // TODO(GloriousTaco:memory): Replace free with a memory safe alternative. free(arena->data); } +} diff --git a/core/memory/arena.h b/core/memory/arena.h index be3a5b4..8ea3add 100644 --- a/core/memory/arena.h +++ b/core/memory/arena.h @@ -5,7 +5,7 @@ #include #include -namespace memory +namespace pound::memory { #define POISON_PATTERN 0xAA @@ -108,5 +108,5 @@ void arena_reset(arena_t* arena); */ void arena_free(memory::arena_t* arena); -} // namespace memory +} // namespace pound::memory #endif //POUND_ARENA_H diff --git a/core/memory/arena_allocator.h b/core/memory/arena_allocator.h index a4a3f3c..164ebef 100644 --- a/core/memory/arena_allocator.h +++ b/core/memory/arena_allocator.h @@ -5,7 +5,7 @@ #include #include "arena.h" -namespace memory +namespace pound::memory { /** @brief An STL-compatible allocator that uses a custom arena for memory management. @@ -65,4 +65,4 @@ namespace memory } -#endif // POUND_ARENA_ALLOCATOR_H \ No newline at end of file +#endif // POUND_ARENA_ALLOCATOR_H