|
@@ -15,6 +15,8 @@
|
|
|
/** @file Thread.cpp
|
|
/** @file Thread.cpp
|
|
|
@brief Implements platform-generic Thread functions. */
|
|
@brief Implements platform-generic Thread functions. */
|
|
|
|
|
|
|
|
|
|
+// Modified by Yao Wei Tjong for Urho3D
|
|
|
|
|
+
|
|
|
#ifdef KNET_USE_BOOST
|
|
#ifdef KNET_USE_BOOST
|
|
|
#include <boost/thread/thread.hpp>
|
|
#include <boost/thread/thread.hpp>
|
|
|
#endif
|
|
#endif
|
|
@@ -100,9 +102,10 @@ typedef struct tagTHREADNAME_INFO
|
|
|
} THREADNAME_INFO;
|
|
} THREADNAME_INFO;
|
|
|
#pragma pack(pop)
|
|
#pragma pack(pop)
|
|
|
|
|
|
|
|
|
|
+// Urho3D - avoid unnecessary warning in MinGW build
|
|
|
|
|
+#ifdef _MSC_VER
|
|
|
void SetThreadName(DWORD dwThreadID, const char *threadName)
|
|
void SetThreadName(DWORD dwThreadID, const char *threadName)
|
|
|
{
|
|
{
|
|
|
-#ifdef _MSC_VER
|
|
|
|
|
THREADNAME_INFO info;
|
|
THREADNAME_INFO info;
|
|
|
info.dwType = 0x1000;
|
|
info.dwType = 0x1000;
|
|
|
info.szName = threadName;
|
|
info.szName = threadName;
|
|
@@ -117,16 +120,14 @@ void SetThreadName(DWORD dwThreadID, const char *threadName)
|
|
|
__except(EXCEPTION_CONTINUE_EXECUTION)
|
|
__except(EXCEPTION_CONTINUE_EXECUTION)
|
|
|
{
|
|
{
|
|
|
}
|
|
}
|
|
|
-#else
|
|
|
|
|
-#warning SetThreadName undefined for current platform!
|
|
|
|
|
-#endif
|
|
|
|
|
}
|
|
}
|
|
|
#endif
|
|
#endif
|
|
|
|
|
+#endif
|
|
|
|
|
|
|
|
void Thread::SetName(const char *name)
|
|
void Thread::SetName(const char *name)
|
|
|
{
|
|
{
|
|
|
// The thread name can only be set when it is ensured that Thread::Id() returns the proper Win32 thread ID
|
|
// The thread name can only be set when it is ensured that Thread::Id() returns the proper Win32 thread ID
|
|
|
-#ifdef WIN32
|
|
|
|
|
|
|
+#ifdef _MSC_VER
|
|
|
#if !defined(KNET_USE_BOOST) || !defined(KNET_ENABLE_WINXP_SUPPORT)
|
|
#if !defined(KNET_USE_BOOST) || !defined(KNET_ENABLE_WINXP_SUPPORT)
|
|
|
SetThreadName(Id(), name);
|
|
SetThreadName(Id(), name);
|
|
|
#endif
|
|
#endif
|