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

Revert usage of unique_ptr - error.

pull/5096/head
Kim Kulling 2023-05-15 16:06:02 +02:00 committed by GitHub
parent 71a4977dd1
commit 94905d445f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
code/Common/StackAllocator.h
View File

@ -60,20 +60,20 @@ namespace Assimp {
*/ */
class StackAllocator { class StackAllocator {
public: public:
// Constructs the allocator /// @brief Constructs the allocator
inline StackAllocator(); inline StackAllocator();
// Destructs the allocator and frees all memory /// @brief Destructs the allocator and frees all memory
inline ~StackAllocator(); inline ~StackAllocator();
// non copyable // non copyable
StackAllocator(const StackAllocator &) = delete; StackAllocator(const StackAllocator &) = delete;
StackAllocator &operator=(const StackAllocator &) = delete; StackAllocator &operator=(const StackAllocator &) = delete;
// Returns a pointer to byteSize bytes of heap memory that persists /// @brief Returns a pointer to byteSize bytes of heap memory that persists
// for the lifetime of the allocator (or until FreeAll is called). /// for the lifetime of the allocator (or until FreeAll is called).
inline void *Allocate(size_t byteSize); inline void *Allocate(size_t byteSize);
// Releases all the memory owned by this allocator. /// @brief Releases all the memory owned by this allocator.
// Memory provided through function Allocate is not valid anymore after this function has been called. // Memory provided through function Allocate is not valid anymore after this function has been called.
inline void FreeAll(); inline void FreeAll();
@ -82,8 +82,7 @@ private:
constexpr const static size_t g_startBytesPerBlock = 16 * 1024; // Size of the first block. Next blocks will double in size until maximum size of g_maxBytesPerBlock constexpr const static size_t g_startBytesPerBlock = 16 * 1024; // Size of the first block. Next blocks will double in size until maximum size of g_maxBytesPerBlock
size_t m_blockAllocationSize = g_startBytesPerBlock; // Block size of the current block size_t m_blockAllocationSize = g_startBytesPerBlock; // Block size of the current block
size_t m_subIndex = g_maxBytesPerBlock; // The current byte offset in the current block size_t m_subIndex = g_maxBytesPerBlock; // The current byte offset in the current block
std::vector<std::unique_ptr<uint8_t[]>> m_storageBlocks; std::vector<uint8_t *> m_storageBlocks; // A list of blocks
//std::vector<uint8_t *> m_storageBlocks; // A list of blocks
}; };
} // namespace Assimp } // namespace Assimp