Merge pull request #6390 from aws-lumberyard-dev/memory/overrideshim_removal

Memory/overrideshim removal
2022-01-26 08:15:20 -08:00
parent 1a7a350880 25157b3fa1
commit 75f511d851
63 changed files with 311 additions and 1231 deletions
@@ -62,7 +62,7 @@ namespace O3DELauncher

        ResourceLimitUpdater m_updateResourceLimits = nullptr; //!< callback for updating system resources, if necessary
        OnPostApplicationStart m_onPostAppStart = nullptr;  //!< callback notifying the platform specific entry point that AzGameFramework::GameApplication::Start has been called
-        AZ::IAllocatorAllocate* m_allocator = nullptr; //!< Used to allocate the temporary bootstrap memory, as well as the main \ref SystemAllocator heap. If null, OSAllocator will be used
+        AZ::IAllocator* m_allocator = nullptr; //!< Used to allocate the temporary bootstrap memory, as well as the main \ref SystemAllocator heap. If null, OSAllocator will be used

        const char* m_appResourcesPath = "."; //!< Path to the device specific assets, default is equivalent to blank path in ParseEngineConfig
        const char* m_appWriteStoragePath = nullptr; //!< Path to writeable storage if different than assets path, used to override userPath and logPath