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

Fixed conflicts

Browse source
This commit is contained in:
Nekotekina 2014-02-26 15:27:06 +04:00
commit 8bd0ee875c
84 changed files with 864 additions and 1211 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Utilities/SMutex.cpp
View file

@ -6,9 +6,9 @@ __forceinline void SM_Sleep()
Sleep(1);
}
__forceinline DWORD SM_GetCurrentThreadId()
__forceinline size_t SM_GetCurrentThreadId()
{
return GetCurrentThreadId();
return std::this_thread::get_id().hash();
}
__forceinline u32 SM_GetCurrentCPUThreadId()
@ -23,4 +23,4 @@ __forceinline u32 SM_GetCurrentCPUThreadId()
__forceinline be_t<u32> SM_GetCurrentCPUThreadIdBE()
{
return SM_GetCurrentCPUThreadId();
}
}