mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-23 20:49:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Moving over more allocations to the memory pool

Browse Source
This commit is contained in:
Alexander Bock
2020-08-05 11:19:09 +02:00
parent 25247c7a37
commit 696bc31861
20 changed files with 51 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/rendering/renderable.cpp
View File

@@ -100,7 +100,7 @@ documentation::Documentation Renderable::Documentation() {
};
}
std::unique_ptr<Renderable> Renderable::createFromDictionary(
ghoul::mm_unique_ptr<Renderable> Renderable::createFromDictionary(
const ghoul::Dictionary& dictionary)
{
documentation::testSpecificationAndThrow(Documentation(), dictionary, "Renderable");
@@ -111,10 +111,10 @@ std::unique_ptr<Renderable> Renderable::createFromDictionary(
ghoul_assert(factory, "Renderable factory did not exist");
Renderable* result = factory->create(
renderableType,
dictionary/*,
&global::memoryManager.PersistentMemory*/
dictionary,
&global::memoryManager.PersistentMemory
);
return std::unique_ptr<Renderable>(result);
return ghoul::mm_unique_ptr<Renderable>(result);
}