TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 06:34:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'devhead/Preview4_0' into tsneo

Browse source 
# Conflicts:
#	Engine/source/platform/types.visualc.h
#	Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript
#	Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/terrain.tscript
#	Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.tscript
#	Templates/BaseGame/game/tools/gui/scriptEditorDlg.ed.gui
This commit is contained in:
Jeff Hutchinson 2021-09-01 22:26:23 -04:00
commit 17231ca9fb
51 changed files with 736 additions and 488 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Engine/source/platformWin32/threads/thread.cpp
View file

@ -43,7 +43,7 @@ public:
Thread* mThread;
HANDLE mThreadHnd;
Semaphore mGateway;
U32 mThreadID;
dsize_t mThreadID;
U32 mDead;
PlatformThreadData()
@ -157,7 +157,7 @@ bool Thread::isAlive()
return ( !mData->mDead );
}
U32 Thread::getId()
dsize_t Thread::getId()
{
return mData->mThreadID;
}
@ -197,12 +197,12 @@ void Thread::_setName( const char* name )
#endif
}
U32 ThreadManager::getCurrentThreadId()
dsize_t ThreadManager::getCurrentThreadId()
{
return GetCurrentThreadId();
}
bool ThreadManager::compare(U32 threadId_1, U32 threadId_2)
bool ThreadManager::compare(dsize_t threadId_1, dsize_t threadId_2)
{
return (threadId_1 == threadId_2);
}