diff options
author | rubidium <rubidium@openttd.org> | 2008-06-08 10:51:36 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2008-06-08 10:51:36 +0000 |
commit | 96d7f87cc99ee04791b9fa097a027a17bb82226b (patch) | |
tree | 051108d9da4b980db5e5e7eb8c7b81c8ea89e9ae /src/thread_win32.cpp | |
parent | b1dc70549245677303a1fdc0da57df92d80242fa (diff) | |
download | openttd-96d7f87cc99ee04791b9fa097a027a17bb82226b.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.cpp | 14 |
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; } }; |