v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compile fix on other platforms

pull/4494/head
Florian Born 2022-04-20 17:57:03 +02:00
parent 320775b939
commit 0355ae967f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/Common/StackAllocator.cpp
View File

@ -59,7 +59,7 @@ void *StackAllocator::Allocate(size_t byteSize) {
// double block size every time, up to maximum of g_maxBytesPerBlock. // double block size every time, up to maximum of g_maxBytesPerBlock.
// Block size must be at least as large as byteSize, but we want to use this for small allocations anyway. // Block size must be at least as large as byteSize, but we want to use this for small allocations anyway.
m_blockAllocationSize = std::max(std::min(m_blockAllocationSize * 2, g_maxBytesPerBlock), byteSize); m_blockAllocationSize = std::max(std::min(m_blockAllocationSize * 2, g_maxBytesPerBlock), byteSize);
uint8_t *data = (uint8_t *)malloc(m_blockAllocationSize); uint8_t *data = new uint8_t[m_blockAllocationSize];
m_storageBlocks.push_back(data); m_storageBlocks.push_back(data);
m_subIndex = byteSize; m_subIndex = byteSize;
return data; return data;
@ -74,7 +74,7 @@ void *StackAllocator::Allocate(size_t byteSize) {
void StackAllocator::FreeAll() { void StackAllocator::FreeAll() {
for (size_t i = 0; i < m_storageBlocks.size(); i++) { for (size_t i = 0; i < m_storageBlocks.size(); i++) {
free(m_storageBlocks[i]); delete [] m_storageBlocks[i];
} }
std::deque<uint8_t *> empty; std::deque<uint8_t *> empty;
m_storageBlocks.swap(empty); m_storageBlocks.swap(empty);