diff options
| author | bunnei <bunneidev@gmail.com> | 2020-11-03 13:41:29 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-03 13:41:29 -0800 |
| commit | 46fdc94586145cdfcf4814f637380c75cb275e31 (patch) | |
| tree | 92fcd66f2ea754f40d7e5f1cc3238dc6470fe2fd | |
| parent | 222fe75401f0672de78c07ba901e650ccc8aa96a (diff) | |
| parent | ee21b5378ba87dafc6e4d84a19a94b53e71aeee2 (diff) | |
Merge pull request #4887 from lioncash/common-build
microprofile: Silence warning in headers
| -rw-r--r-- | externals/microprofile/microprofile.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/externals/microprofile/microprofile.h b/externals/microprofile/microprofile.h index 5c381f002..a06f6457d 100644 --- a/externals/microprofile/microprofile.h +++ b/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) |