Browse Source
Merge pull request #4887 from lioncash/common-build
microprofile: Silence warning in headers
pull/15/merge
bunnei
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
5 additions and
1 deletions
-
externals/microprofile/microprofile.h
|
|
|
@ -948,7 +948,11 @@ typedef HANDLE MicroProfileThread; |
|
|
|
DWORD _stdcall ThreadTrampoline(void* 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) |
|
|
|
|