X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fthread.h;h=8d323b328441896a6c3a928ec51fc560ed84847b;hb=de795c6fa9ea4d10431692a673be989a502ac475;hp=2b0766c68ba7fbd0d443265d30d58628ddda76f8;hpb=e1ea831a640fba534e7e42e399f04cdf681ef8d3;p=libs%2Fcore.git

diff --git a/source/core/thread.h b/source/core/thread.h
index 2b0766c..8d323b3 100644
--- a/source/core/thread.h
+++ b/source/core/thread.h
@@ -1,10 +1,12 @@
-/*
-This file is part of libmspframework
+/* $Id$
+
+This file is part of libmspcore
 Copyright © 2006 Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
-#ifndef MSP_FRAMEWORK_THREAD_H_
-#define MSP_FRAMEWORK_THREAD_H_
+
+#ifndef MSP_CORE_THREAD_H_
+#define MSP_CORE_THREAD_H_
 
 #include "types.h"
 
@@ -19,30 +21,34 @@ is started.
 */
 class Thread
 {
+private:
+	ThreadHandle thread_;
+	bool         launched_;
+
+protected:
+	Thread(): launched_(false) { }
 public:
+	virtual ~Thread();
+
 	void join();
 	void cancel();
 	void kill();
-	virtual ~Thread();
 protected:
-	Thread(): launched_(false) { }
 	void launch();
 	virtual void main()=0;
 	void check_cancel();
-private:
-	ThreadHandle thread_;
-	bool         launched_;
-
-	Thread(const Thread &);
-	Thread &operator=(const Thread &);
 
+private:
+	static
 #ifdef WIN32
-#	define THREAD_RETURN_ DWORD WINAPI
+	DWORD WINAPI
 #else
-#	define THREAD_RETURN_ void *
+	void *
 #endif
-	static THREAD_RETURN_ main_(void *t) { ((Thread *)t)->main(); return 0; }
-#undef THREAD_RETURN_
+	main_(void *t) { (reinterpret_cast<Thread *>(t))->main(); return 0; }
+
+	Thread(const Thread &);
+	Thread &operator=(const Thread &);
 };
 
 } // namespace Msp