birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'development' into memory/overrideshim_removal

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Framework/AzCore/AzCore/Memory/AllocatorBase.cpp
#	Code/Framework/AzCore/AzCore/Memory/BestFitExternalMapAllocator.cpp
#	Code/Framework/AzCore/AzCore/Memory/BestFitExternalMapSchema.cpp
#	Code/Framework/AzCore/AzCore/Memory/PoolSchema.cpp
#	Code/Framework/AzCore/AzCore/Memory/SystemAllocator.cpp
#	Code/Framework/AzCore/Tests/Memory/AllocatorBenchmarks.cpp
This commit is contained in:
Esteban Papp
2022-01-05 11:34:52 -08:00
parent d108fe4804 89067fe667
commit ddbcc68106
1267 changed files with 157305 additions and 27177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Legacy/CrySystem/RemoteConsole/RemoteConsole.h
+1 -1
View File
@@ -15,7 +15,7 @@
#include <CryCommon/CryListenerSet.h>
#include <CryCommon/StaticInstance.h>
#if !defined(RELEASE) || defined(RELEASE_LOGGING) || defined(ENABLE_PROFILING_CODE)
#if (!defined(RELEASE) || defined(RELEASE_LOGGING) || defined(ENABLE_PROFILING_CODE)) && !defined(AZ_LEGACY_CRYSYSTEM_TRAIT_REMOTE_CONSOLE_UNSUPPORTED)
#define USE_REMOTE_CONSOLE
struct SRemoteServer;
Code/Legacy/CrySystem/RemoteConsole/RemoteConsole_none.inl
+5 -5
View File
@@ -41,17 +41,17 @@ void CRemoteConsole::Stop()
}
/////////////////////////////////////////////////////////////////////////////////////////////
void CRemoteConsole::AddLogMessage(const char* log)
void CRemoteConsole::AddLogMessage(const char*)
{
}
/////////////////////////////////////////////////////////////////////////////////////////////
void CRemoteConsole::AddLogWarning(const char* log)
void CRemoteConsole::AddLogWarning(const char*)
{
}
/////////////////////////////////////////////////////////////////////////////////////////////
void CRemoteConsole::AddLogError(const char* log)
void CRemoteConsole::AddLogError(const char*)
{
}
@@ -61,11 +61,11 @@ void CRemoteConsole::Update()
}
/////////////////////////////////////////////////////////////////////////////////////////////
void CRemoteConsole::RegisterListener(IRemoteConsoleListener* pListener, const char* name)
void CRemoteConsole::RegisterListener(IRemoteConsoleListener*, const char*)
{
}
/////////////////////////////////////////////////////////////////////////////////////////////
void CRemoteConsole::UnregisterListener(IRemoteConsoleListener* pListener)
void CRemoteConsole::UnregisterListener(IRemoteConsoleListener*)
{
}
Code/Legacy/CrySystem/SystemInit.cpp
+1 -1
View File
@@ -1080,7 +1080,7 @@ AZ_POP_DISABLE_WARNING
{
m_pUserCallback->OnInitProgress("Initializing additional systems...");
}
AZ_Printf(AZ_TRACE_SYSTEM_WINDOW, "Initializing additional systems");
AZ_Printf(AZ_TRACE_SYSTEM_WINDOW, "Initializing additional systems\n");
InlineInitializationProcessing("CSystem::Init AIInit");