Use the remote channel's capitalization on a losing TS merge

[user/henk/code/inspircd.git] / src / threadengine.cpp

diff --git a/src/threadengine.cpp b/src/threadengine.cpp
index 805006ab790aac2accf35ce5be9e1519166fa600..4ea95bcf0a5aaac29ad1e57968e747c142f0ba77 100644 (file)
--- a/src/threadengine.cpp
+++ b/src/threadengine.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *         the file COPYING for details.
@@ -20,14 +20,21 @@
 #include "inspircd.h"
 #include "threadengine.h"
 
-ThreadEngine::ThreadEngine(InspIRCd* Instance) : ServerInstance(Instance)
+void Thread::SetExitFlag()
 {
+       ExitFlag = true;
 }
 
-ThreadEngine::~ThreadEngine()
+void Thread::join()
 {
+               state->FreeThread(this);
+               delete state;
+               state = 0;
 }
 
-Mutex::Mutex(InspIRCd* Instance) : ServerInstance(Instance)
+/** If this thread has a Creator set, call it to
+ * free the thread
+ */
+Thread::~Thread()
 {
 }