X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fcore%2Fthread.h;h=ae257078569c47844e0d4502886f5de403371885;hb=1f0843257065789231a9949e0a81b79afd7bbebe;hp=ac7169ff0250c509260f7303834d34fb7fb83155;hpb=62a984b46e08740d19cb055f01be3365982f6b9d;p=libs%2Fcore.git

diff --git a/source/core/thread.h b/source/core/thread.h
index ac7169f..ae25707 100644
--- a/source/core/thread.h
+++ b/source/core/thread.h
@@ -26,7 +26,12 @@ private:
 public:
 	virtual ~Thread();
 
+	/** Waits for the thread to exit.  Calling this from the thread will cause a
+	deadlock. */
 	void join();
+
+	/** Violently terminates the thread.  This should only be used as a last
+	resort, as the thread gets no chance to clean up. */
 	void kill();
 protected:
 	void launch();