archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-07 15:31:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Conflicts fixed

Browse source
This commit is contained in:
Nekotekina 2014-03-06 15:50:45 +04:00
parent e86a849600
commit 05c6a96d27
22 changed files with 501 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Utilities/SMutex.cpp
View file

@ -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()