diff options
author | maximius <none@none> | 2009-10-17 15:35:07 -0700 |
---|---|---|
committer | maximius <none@none> | 2009-10-17 15:35:07 -0700 |
commit | 26b5e033ffde3d161382fc9addbfa99738379641 (patch) | |
tree | a344f369ca32945f787a02dee35c3dbe342bed7e /dep/src/sockets/Thread.cpp | |
parent | f21f47005dcb6b76e1abc9f35fbcd03eed191bff (diff) |
*Massive cleanup (\n\n -> \n, *\n -> \n, cleanup for(...) to for (...), and some other cleanups by hand)
*Fix a possible crash in Spell::DoAllEffectOnTarget
--HG--
branch : trunk
Diffstat (limited to 'dep/src/sockets/Thread.cpp')
-rw-r--r-- | dep/src/sockets/Thread.cpp | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/dep/src/sockets/Thread.cpp b/dep/src/sockets/Thread.cpp index a387a7e3824..713c02b3f52 100644 --- a/dep/src/sockets/Thread.cpp +++ b/dep/src/sockets/Thread.cpp @@ -4,25 +4,20 @@ **/ /* Copyright (C) 2004-2007 Anders Hedstrom - This library is made available under the terms of the GNU GPL. - If you would like to use this library in a closed-source application, a separate license agreement is available. For information about the closed-source license agreement for the C++ sockets library, please visit http://www.alhem.net/Sockets/license.html and/or email license@alhem.net. - This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -34,15 +29,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #else #include <unistd.h> #endif - #include "Thread.h" - #ifdef SOCKETS_NAMESPACE namespace SOCKETS_NAMESPACE { #endif - Thread::Thread(bool release) :m_thread(0) ,m_running(true) @@ -55,7 +47,6 @@ Thread::Thread(bool release) m_thread = (HANDLE)_beginthreadex(NULL, 0, &StartThread, this, 0, &m_dwThreadId); #else pthread_attr_t attr; - pthread_attr_init(&attr); pthread_attr_setdetachstate(&attr,PTHREAD_CREATE_DETACHED); if (pthread_create(&m_thread,&attr, StartThread,this) == -1) @@ -68,7 +59,6 @@ Thread::Thread(bool release) m_release = release; } - Thread::~Thread() { m_b_destructor = true; @@ -88,11 +78,9 @@ Thread::~Thread() #endif } - threadfunc_t STDPREFIX Thread::StartThread(threadparam_t zz) { Thread *p = (Thread *)zz; - while (p -> m_running && !p -> m_release) { #ifdef _WIN32 @@ -116,52 +104,43 @@ threadfunc_t STDPREFIX Thread::StartThread(threadparam_t zz) return (threadfunc_t)NULL; } - bool Thread::IsRunning() { return m_running; } - void Thread::SetRunning(bool x) { m_running = x; } - bool Thread::IsReleased() { return m_release; } - void Thread::SetRelease(bool x) { m_release = x; } - bool Thread::DeleteOnExit() { return m_b_delete_on_exit; } - void Thread::SetDeleteOnExit(bool x) { m_b_delete_on_exit = x; } - bool Thread::IsDestructor() { return m_b_destructor; } - #ifdef SOCKETS_NAMESPACE } #endif - |