(svn r13411) -Codechange: remove the return value from the thread procs because it is never used.

This commit is contained in:
rubidium
2008-06-08 10:51:36 +00:00
parent b1dc705492
commit 96d7f87cc9
7 changed files with 20 additions and 39 deletions

View File

@@ -20,7 +20,6 @@ private:
OTTDThreadFunc m_proc;
void *m_param;
bool m_attached;
void *ret;
public:
/**
@@ -91,14 +90,12 @@ public:
throw 0;
}
/* virtual */ void *Join()
/* virtual */ void Join()
{
/* You cannot join yourself */
assert(!IsCurrent());
WaitForSingleObject(m_h_thr, INFINITE);
return this->ret;
}
/* virtual */ bool IsCurrent()
@@ -119,21 +116,20 @@ private:
*/
static uint CALLBACK stThreadProc(void *thr)
{
return ((ThreadObject_Win32 *)thr)->ThreadProc();
((ThreadObject_Win32 *)thr)->ThreadProc();
return 0;
}
/**
* A new thread is created, and this function is called. Call the custom
* function of the creator of the thread.
*/
uint ThreadProc()
void ThreadProc()
{
try {
this->ret = m_proc(m_param);
m_proc(m_param);
} catch (...) {
}
return 0;
}
};