*Merge.

--HG--
branch : trunk

1 files changed, 11 insertions, 11 deletions

diff --git a/dep/src/zthread/macos/ThreadOps.h b/dep/src/zthread/macos/ThreadOps.h
index c100fcfefe5..5c4eb044e73 100644
--- a/dep/src/zthread/macos/ThreadOps.h
+++ b/dep/src/zthread/macos/ThreadOps.h
@@ -33,14 +33,14 @@
 namespace ZThread {
 
 class Runnable;
- 
+
 /**
  * @class ThreadOps
  * @author Eric Crahen <http://www.code-foo.com>
  * @date <2003-07-16T23:26:01-0400>
  * @version 2.2.0
  *
- * This class is an abstraction used to perform various operations on a 
+ * This class is an abstraction used to perform various operations on a
  * native POSIX thread.
  */
 class ThreadOps {
@@ -55,10 +55,10 @@ class ThreadOps {
 
 public:
 
-  const static ThreadOps INVALID; 
+  const static ThreadOps INVALID;
 
   /**
-   * Create a new ThreadOps to manipulate a native thread. 
+   * Create a new ThreadOps to manipulate a native thread.
    */
   ThreadOps();
 
@@ -84,20 +84,20 @@ public:
   }
 
   /**
-   * Activating an instance of ThreadOps will map it onto the currently  
+   * Activating an instance of ThreadOps will map it onto the currently
    * executing thread.
-   */ 
+   */
   static void activate(ThreadOps* ops) {
 
     assert(ops);
     assert(ops->_tid == 0);
 
     ops->_tid = MPCurrentTaskID();
-    
+
   }
 
   /**
-   * Test if this object represents the currently executing 
+   * Test if this object represents the currently executing
    * native thread.
    *
    * @return bool true if successful
@@ -119,7 +119,7 @@ public:
   static bool join(ThreadOps*);
 
   /**
-   * Force the current native thread to yield, letting the scheduler 
+   * Force the current native thread to yield, letting the scheduler
    * give the CPU time to another thread.
    *
    * @return bool true if successful, false if the operation can't
@@ -128,7 +128,7 @@ public:
   static bool yield();
 
   /**
-   * Set the priority for the native thread if supported by the 
+   * Set the priority for the native thread if supported by the
    * system.
    *
    * @param PRIORITY requested priority
@@ -137,7 +137,7 @@ public:
   static bool setPriority(ThreadOps*, Priority);
 
   /**
-   * Set the priority for the native thread if supported by the 
+   * Set the priority for the native thread if supported by the
    * system.
    *
    * @param Thread::PRIORITY& current priority