*Merge.

--HG--
branch : trunk

1 files changed, 20 insertions, 20 deletions

diff --git a/dep/include/zthread/RecursiveMutex.h b/dep/include/zthread/RecursiveMutex.h
index 7dda9c5119b..25df4484b6b 100644
--- a/dep/include/zthread/RecursiveMutex.h
+++ b/dep/include/zthread/RecursiveMutex.h
@@ -26,8 +26,8 @@
 #include "zthread/Lockable.h"
 #include "zthread/NonCopyable.h"
 
-namespace ZThread { 
-  
+namespace ZThread {
+
   class RecursiveMutexImpl;
 
   /**
@@ -37,9 +37,9 @@ namespace ZThread {
    * @date <2003-07-16T17:51:33-0400>
    * @version 2.2.1
    *
-   * A RecursiveMutex is a recursive, MUTual EXclusion Lockable object. It is  
-   * recursive because it can be acquire()d and release()d more than once 
-   * by the same thread, instead of causing a Deadlock_Exception. 
+   * A RecursiveMutex is a recursive, MUTual EXclusion Lockable object. It is
+   * recursive because it can be acquire()d and release()d more than once
+   * by the same thread, instead of causing a Deadlock_Exception.
    *
    * @see Mutex
    * @see Guard
@@ -50,15 +50,15 @@ namespace ZThread {
    *
    * <b>Error Checking</b>
    *
-   * A Mutex will throw an InvalidOp_Exception if an attempt to release() a Mutex is 
+   * A Mutex will throw an InvalidOp_Exception if an attempt to release() a Mutex is
    * made from the context of a thread that does not currently own that Mutex.
    */
   class ZTHREAD_API RecursiveMutex : public Lockable, private NonCopyable {
-  
+
     RecursiveMutexImpl* _impl;
-  
+
   public:
-  
+
     //! Create a new RecursiveMutex.
     RecursiveMutex();
 
@@ -66,10 +66,10 @@ namespace ZThread {
     virtual ~RecursiveMutex();
 
     /**
-     * Acquire a RecursiveMutex, possibly blocking until the the current owner of the 
+     * Acquire a RecursiveMutex, possibly blocking until the the current owner of the
      * releases it or until an exception is thrown.
      *
-     * Only one thread may acquire the RecursiveMutex at any given time. 
+     * Only one thread may acquire the RecursiveMutex at any given time.
      * The same thread may acquire a RecursiveMutex multiple times.
      *
      * @exception Interrupted_Exception thrown when the calling thread is interrupted.
@@ -80,18 +80,18 @@ namespace ZThread {
      *
      * @see Lockable::acquire()
      */
-    virtual void acquire(); 
+    virtual void acquire();
 
     /**
-     * Acquire a RecursiveMutex, possibly blocking until the the current owner 
+     * Acquire a RecursiveMutex, possibly blocking until the the current owner
      * releases it, until an exception is thrown or until the given amount
      * of time expires.
      *
-     * Only one thread may acquire the RecursiveMutex at any given time. 
+     * Only one thread may acquire the RecursiveMutex at any given time.
      * The same thread may acquire a RecursiveMutex multiple times.
      *
      * @param timeout maximum amount of time (milliseconds) this method could block
-     * @return 
+     * @return
      * - <em>true</em> if the lock was acquired
      * - <em>false</em> if the lock was acquired
      *
@@ -108,16 +108,16 @@ namespace ZThread {
 
     /**
      * Release exclusive access. No safety or state checks are performed.
-     * 
-     * @pre This should not be called more times than the acquire() method was 
+     *
+     * @pre This should not be called more times than the acquire() method was
      *      called.
      *
      * @see Lockable::release()
      */
     virtual void release();
-   
-  }; 
-  
+
+  };
+
 } // namespace ZThread
 
 #endif // __ZTRECURSIVEMUTEX_H__