Improve support for wildcards in <link:name>.

[user/henk/code/inspircd.git] / include / threadengine.h

diff --git a/include/threadengine.h b/include/threadengine.h
index 032da153917898ff2027071e93a5d920b0df6ea8..964b8d796d0a5c97c36751c68d59c7aa2f90eb62 100644 (file)
--- a/include/threadengine.h
+++ b/include/threadengine.h
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "base.h"
 
-class ThreadData;
-
 /** Derive from this class to implement your own threaded sections of
  * code. Be sure to keep your code thread-safe and not prone to deadlocks
  * and race conditions if you MUST use threading!
@@ -41,7 +39,7 @@ class CoreExport Thread
 
        /** Opaque thread state managed by the ThreadEngine
         */
-       ThreadData state;
+       ThreadEngine::ThreadState state;
 
        /** ThreadEngine manages Thread::state
         */
@@ -62,9 +60,6 @@ class CoreExport Thread
        {
        }
 
-       /* If the thread is running, you MUST join BEFORE deletion */
-       virtual ~Thread();
-
        /** Override this method to put your actual
         * threaded code here.
         */
@@ -113,7 +108,7 @@ class CoreExport QueuedThread : public Thread
                queue.Wakeup();
                queue.Unlock();
        }
-       virtual void SetExitFlag()
+       void SetExitFlag() CXX11_OVERRIDE
        {
                queue.Lock();
                Thread::SetExitFlag();
@@ -162,7 +157,7 @@ class CoreExport SocketThread : public Thread
                queue.Wakeup();
                queue.Unlock();
        }
-       virtual void SetExitFlag()
+       void SetExitFlag() CXX11_OVERRIDE
        {
                queue.Lock();
                Thread::SetExitFlag();