Merge branch 'development' into cmake/warn_virtual

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-09-10 20:27:01 -07:00
156 changed files with 35196 additions and 34784 deletions
@@ -9,16 +9,3 @@
#pragma once
#include <unistd.h>
#define __STDC_FORMAT_MACROS
#include <inttypes.h>
// types like AZ::u64 require an usigned long long, but inttypes.h has it as unsigned long
#undef PRIX64
#undef PRIx64
#undef PRId64
#undef PRIu64
#define PRIX64 "llX"
#define PRIx64 "llx"
#define PRId64 "lld"
#define PRIu64 "llu"
@@ -15,7 +15,7 @@ namespace AZStd
{
namespace Platform
{
void PostThreadRun();
unsigned __stdcall PostThreadRun();
HANDLE CreateThread(unsigned stackSize, unsigned (__stdcall* threadRunFunction)(void*), AZStd::Internal::thread_info* ti, unsigned int* id);
unsigned HardwareConcurrency();
void SetThreadName(HANDLE hThread, const char* threadName);
@@ -40,9 +40,7 @@ namespace AZStd
ThreadEventBus::Broadcast(&ThreadEventBus::Events::OnThreadExit, this_thread::get_id()); // goes to client listeners
ThreadDrillerEventBus::Broadcast(&ThreadDrillerEventBus::Events::OnThreadExit, this_thread::get_id()); // goes to the profiler.
Platform::PostThreadRun();
return 0;
return Platform::PostThreadRun();
}
/**
@@ -16,9 +16,10 @@ namespace AZStd
{
namespace Platform
{
void PostThreadRun()
unsigned __stdcall PostThreadRun()
{
_endthreadex(0);
return 0;
}
HANDLE CreateThread(unsigned stackSize, unsigned (__stdcall* threadRunFunction)(void*), AZStd::Internal::thread_info* ti, unsigned int* id)