aboutsummaryrefslogtreecommitdiff
path: root/zencore/memory.cpp
diff options
context:
space:
mode:
authorMartin Ridgers <[email protected]>2022-01-05 12:13:48 +0100
committerMartin Ridgers <[email protected]>2022-01-05 15:15:47 +0100
commitd0686384ae2362f3e47597c939db40f50f4ba1fc (patch)
tree7bfc056e36d19989323ea5689450e8d47d5fe904 /zencore/memory.cpp
parentCleaned up some unnecessary comments (diff)
downloadzen-d0686384ae2362f3e47597c939db40f50f4ba1fc.tar.xz
zen-d0686384ae2362f3e47597c939db40f50f4ba1fc.zip
Function parameter case consistency with the rest of the code base
Diffstat (limited to 'zencore/memory.cpp')
-rw-r--r--zencore/memory.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/zencore/memory.cpp b/zencore/memory.cpp
index 53ab1c13a..1f148cede 100644
--- a/zencore/memory.cpp
+++ b/zencore/memory.cpp
@@ -19,19 +19,19 @@ namespace zen {
//////////////////////////////////////////////////////////////////////////
static void*
-AlignedAllocImpl(size_t size, size_t alignment)
+AlignedAllocImpl(size_t Size, size_t Alignment)
{
#if ZEN_PLATFORM_WINDOWS
# if ZEN_USE_MIMALLOC && 0 /* this path is not functional */
- return mi_aligned_alloc(alignment, size);
+ return mi_aligned_alloc(Alignment, Size);
# else
- return _aligned_malloc(size, alignment);
+ return _aligned_malloc(Size, Alignment);
# endif
#else
// aligned_alloc() states that size must be a multiple of alignment. Some
// platforms return null if this requirement isn't met.
- size = (size + alignment - 1) & ~(alignment - 1);
- return std::aligned_alloc(alignment, size);
+ Size = (Size + Alignment - 1) & ~(Alignment - 1);
+ return std::aligned_alloc(Alignment, Size);
#endif
}
@@ -63,9 +63,9 @@ MemoryArena::~MemoryArena()
}
void*
-MemoryArena::Alloc(size_t size, size_t alignment)
+MemoryArena::Alloc(size_t Size, size_t Alignment)
{
- return AlignedAllocImpl(size, alignment);
+ return AlignedAllocImpl(Size, Alignment);
}
void
@@ -77,9 +77,9 @@ MemoryArena::Free(void* ptr)
//////////////////////////////////////////////////////////////////////////
void*
-Memory::Alloc(size_t size, size_t alignment)
+Memory::Alloc(size_t Size, size_t Alignment)
{
- return AlignedAllocImpl(size, alignment);
+ return AlignedAllocImpl(Size, Alignment);
}
void