summaryrefslogtreecommitdiff
path: root/src/thread_win32.cpp
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2008-06-08 10:51:36 +0000
committerrubidium <rubidium@openttd.org>2008-06-08 10:51:36 +0000
commit4657ae97fcd9487adb882f8634ad5cfe589d034c (patch)
tree051108d9da4b980db5e5e7eb8c7b81c8ea89e9ae /src/thread_win32.cpp
parentd49a86cf48a091c1cd78d9e440b648707946060d (diff)
downloadopenttd-4657ae97fcd9487adb882f8634ad5cfe589d034c.tar.xz
(svn r13411) -Codechange: remove the return value from the thread procs because it is never used.
Diffstat (limited to 'src/thread_win32.cpp')
-rw-r--r--src/thread_win32.cpp14
1 files changed, 5 insertions, 9 deletions
diff --git a/src/thread_win32.cpp b/src/thread_win32.cpp
index 778bee9bf..6f12a6fbc 100644
--- a/src/thread_win32.cpp
+++ b/src/thread_win32.cpp
@@ -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;
}
};