franklinblanco/yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4887 from lioncash/common-build

Browse Source 
microprofile: Silence warning in headers
This commit is contained in:
bunnei 2020-11-03 13:41:29 -08:00 committed by GitHub
commit 46fdc94586
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
externals/microprofile/microprofile.h vendored
View File

@ -948,7 +948,11 @@ typedef HANDLE MicroProfileThread;
DWORD _stdcall ThreadTrampoline(void* pFunc) DWORD _stdcall ThreadTrampoline(void* pFunc)
{ {
MicroProfileThreadFunc F = (MicroProfileThreadFunc)pFunc; MicroProfileThreadFunc F = (MicroProfileThreadFunc)pFunc;
return (DWORD)F(0);
// The return value of F will always return a void*, however, this is for
// compatibility with pthreads. The underlying "address" of the pointer
// is always a 32-bit value, so this cast is safe to perform.
return static_cast<DWORD>(reinterpret_cast<uint64_t>(F(0)));
} }
inline void MicroProfileThreadStart(MicroProfileThread* pThread, MicroProfileThreadFunc Func) inline void MicroProfileThreadStart(MicroProfileThread* pThread, MicroProfileThreadFunc Func)