Skip to content

Commit 8e85d6c

Browse files
committed
more changes again
1 parent 4a6404a commit 8e85d6c

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

ZEngine/ZEngine/Core/Container/Array.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ namespace ZEngine::Core::Container
166166

167167
size_t old_alloc_size = m_capacity * sizeof(T);
168168
size_t new_alloc_size = new_capacity * sizeof(T);
169-
m_data = static_cast<pointer>(ZENGINE_RESIZE_MEMORY(m_allocator, m_data, old_alloc_size, new_alloc_size, ZENGINE_TYPE_ALIGNMENT(value_type)));
169+
m_data = static_cast<pointer>(ZResize(m_allocator, m_data, old_alloc_size, new_alloc_size, ZAlignof(value_type)));
170170
m_capacity = new_capacity;
171171
}
172172

ZEngine/ZEngine/Core/Container/Strings.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ namespace ZEngine::Core::Container
167167
size_t old_alloc_size = m_capacity * sizeof(char);
168168
size_t new_alloc_size = new_capacity * sizeof(char);
169169

170-
m_data = static_cast<pointer>(ZENGINE_RESIZE_MEMORY(m_allocator, m_data, old_alloc_size, new_alloc_size, ZENGINE_TYPE_ALIGNMENT(value_type)));
170+
m_data = static_cast<pointer>(ZResize(m_allocator, m_data, old_alloc_size, new_alloc_size, ZAlignof(value_type)));
171171
m_capacity = new_capacity;
172172
}
173173

ZEngine/ZEngine/ZEngineDef.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@
3939
collection.shrink_to_fit(); \
4040
}
4141

42-
#define ZENGINE_RESIZE_MEMORY(allocator, ptr, old_size, new_size, alignment) ((allocator)->Resize((ptr), (old_size), (new_size), (alignment)))
42+
#define ZResize(allocator, ptr, old_size, new_size, alignment) ((allocator)->Resize((ptr), (old_size), (new_size), (alignment)))
4343

44-
#define ZENGINE_TYPE_ALIGNMENT(type) ((alignof(type) < DEFAULT_ALIGNMENT) ? DEFAULT_ALIGNMENT : alignof(type))
44+
#define ZAlignof(type) ((alignof(type) < DEFAULT_ALIGNMENT) ? DEFAULT_ALIGNMENT : alignof(type))
4545

46-
#define SINGLE_ARG(...) __VA_ARGS__
46+
#define SINGLE_ARG(...) __VA_ARGS__
4747

48-
#define MAX_FILE_PATH_COUNT 256
48+
#define MAX_FILE_PATH_COUNT 256
4949

5050
/*
5151
* Allocator and Memory Macros

0 commit comments

Comments
 (0)