mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-07-07 07:21:25 +12:00
Conflicts fixed
This commit is contained in:
parent
e86a849600
commit
05c6a96d27
22 changed files with 501 additions and 132 deletions
|
@ -1,6 +1,7 @@
|
|||
#include <stdafx.h>
|
||||
#include <Utilities/SMutex.h>
|
||||
|
||||
|
||||
__forceinline void SM_Sleep()
|
||||
{
|
||||
Sleep(1);
|
||||
|
@ -8,7 +9,7 @@ __forceinline void SM_Sleep()
|
|||
|
||||
__forceinline size_t SM_GetCurrentThreadId()
|
||||
{
|
||||
return std::this_thread::get_id().hash();
|
||||
return std::hash<std::thread::id>()(std::this_thread::get_id());
|
||||
}
|
||||
|
||||
__forceinline u32 SM_GetCurrentCPUThreadId()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue