Merge branch 'master' into unicode

1 files changed, 6 insertions, 1 deletions

diff --git a/src/stable/thread.h b/src/stable/thread.h
index 294c250..5174d1c 100644
--- a/src/stable/thread.h
+++ b/src/stable/thread.h
@@ -79,11 +79,16 @@ namespace Bu
          * probably create a memory leak type of situation.  Instead of stop,
          * consider using cancel, which can be handled by the running thread in
          * a graceful manner.
+         *
+         * NOTE: This was called stop(), but that was too ambiguous and common
+         * of a name to implement in subclasses. The functionality was not
+         * obvious, and this was sometimes used in place of a clean stopping
+         * routine.
          *@returns True if the thread was stopped, false otherwise.  When this
          * function returns the thread may not have stopped, to ensure that the
          * thread has really stopped, call join.
          */
-        bool stop();
+        bool forceStop();
 
         /**
          * Join the thread in action.  This function performs what is commonly