*Merge.

--HG--
branch : trunk

45 files changed, 45 insertions, 0 deletions

diff --git a/dep/include/zthread/AtomicCount.h b/dep/include/zthread/AtomicCount.h
index 38e67dc0d0b..8314b345b4f 100644
--- a/dep/include/zthread/AtomicCount.h
+++ b/dep/include/zthread/AtomicCount.h
@@ -72,3 +72,4 @@ namespace ZThread {
 } // namespace ZThread
 
 #endif // __ZTATOMICCOUNT_H__
+
diff --git a/dep/include/zthread/Barrier.h b/dep/include/zthread/Barrier.h
index ec0d9fc8bb8..74381150a03 100644
--- a/dep/include/zthread/Barrier.h
+++ b/dep/include/zthread/Barrier.h
@@ -326,3 +326,4 @@ namespace ZThread {
 } // namespace ZThread
 
 #endif // __ZTBARRIER_H__
+
diff --git a/dep/include/zthread/BiasedReadWriteLock.h b/dep/include/zthread/BiasedReadWriteLock.h
index 1fcff74e032..f1877bb116b 100644
--- a/dep/include/zthread/BiasedReadWriteLock.h
+++ b/dep/include/zthread/BiasedReadWriteLock.h
@@ -317,3 +317,4 @@ namespace ZThread {
 }; // __ZTBIASEDREADWRITELOCK_H__
 
 #endif
+
diff --git a/dep/include/zthread/BlockingQueue.h b/dep/include/zthread/BlockingQueue.h
index da0b701a825..cf57c12cba9 100644
--- a/dep/include/zthread/BlockingQueue.h
+++ b/dep/include/zthread/BlockingQueue.h
@@ -243,3 +243,4 @@ namespace ZThread {
 } // namespace ZThread
 
 #endif // __ZTBLOCKINGQUEUE_H__
+
diff --git a/dep/include/zthread/BoundedQueue.h b/dep/include/zthread/BoundedQueue.h
index 528e6d869d0..95b0ceaaf64 100644
--- a/dep/include/zthread/BoundedQueue.h
+++ b/dep/include/zthread/BoundedQueue.h
@@ -385,3 +385,4 @@ namespace ZThread {
 } // namespace ZThread
 
 #endif // __ZTBOUNDEDQUEUE_H__
+
diff --git a/dep/include/zthread/Cancelable.h b/dep/include/zthread/Cancelable.h
index 8d1cae526c3..bf2874b3387 100644
--- a/dep/include/zthread/Cancelable.h
+++ b/dep/include/zthread/Cancelable.h
@@ -84,3 +84,4 @@ namespace ZThread {
 } // namespace ZThread
 
 #endif // __ZTCANCELABLE_H__
+
diff --git a/dep/include/zthread/ClassLockable.h b/dep/include/zthread/ClassLockable.h
index 7c1eb0b5059..6554b70b487 100644
--- a/dep/include/zthread/ClassLockable.h
+++ b/dep/include/zthread/ClassLockable.h
@@ -72,3 +72,4 @@ namespace ZThread {
 } // namespace ZThread
 
 #endif // __ZTCLASSLOCKABLE_H__
+
diff --git a/dep/include/zthread/ConcurrentExecutor.h b/dep/include/zthread/ConcurrentExecutor.h
index ccfd4a7ab67..df8c18589b5 100644
--- a/dep/include/zthread/ConcurrentExecutor.h
+++ b/dep/include/zthread/ConcurrentExecutor.h
@@ -122,3 +122,4 @@ namespace ZThread {
 } // namespace ZThread
 
 #endif // __ZTCONCURRENTEXECUTOR_H__
+
diff --git a/dep/include/zthread/Condition.h b/dep/include/zthread/Condition.h
index 60f4b544ea9..919f60c4893 100644
--- a/dep/include/zthread/Condition.h
+++ b/dep/include/zthread/Condition.h
@@ -152,3 +152,4 @@ namespace ZThread {
 } // namespace ZThread
 
 #endif // __ZTCONDITION_H__
+
diff --git a/dep/include/zthread/Config.h b/dep/include/zthread/Config.h
index ee03c831dc4..4d30c2711e6 100644
--- a/dep/include/zthread/Config.h
+++ b/dep/include/zthread/Config.h
@@ -216,3 +216,4 @@
 
 #endif // __ZTCONFIG_H__
 
+
diff --git a/dep/include/zthread/CountedPtr.h b/dep/include/zthread/CountedPtr.h
index 095b61c7ab5..c94392398e2 100644
--- a/dep/include/zthread/CountedPtr.h
+++ b/dep/include/zthread/CountedPtr.h
@@ -287,3 +287,4 @@ namespace ZThread {
 
 
 #endif // __ZTCOUNTEDPTR_H__
+
diff --git a/dep/include/zthread/CountingSemaphore.h b/dep/include/zthread/CountingSemaphore.h
index ea23300c2a7..cdaf98a75ff 100644
--- a/dep/include/zthread/CountingSemaphore.h
+++ b/dep/include/zthread/CountingSemaphore.h
@@ -136,3 +136,4 @@ namespace ZThread {
 } // namespace ZThread
 
 #endif // __ZTCOUNTINGSEMAPHORE_H__
+
diff --git a/dep/include/zthread/Exceptions.h b/dep/include/zthread/Exceptions.h
index 7a387feb5a4..458c556c0ff 100644
--- a/dep/include/zthread/Exceptions.h
+++ b/dep/include/zthread/Exceptions.h
@@ -242,3 +242,4 @@ class Future_Exception : public Synchronization_Exception {
 };
 
 #endif // __ZTEXCEPTIONS_H__
+
diff --git a/dep/include/zthread/Executor.h b/dep/include/zthread/Executor.h
index 1c6a81a72eb..a500c0a6a00 100644
--- a/dep/include/zthread/Executor.h
+++ b/dep/include/zthread/Executor.h
@@ -92,3 +92,4 @@ namespace ZThread {
 } // namespace ZThread
 
 #endif // __ZTEXECUTOR_H__
+
diff --git a/dep/include/zthread/FairReadWriteLock.h b/dep/include/zthread/FairReadWriteLock.h
index 908f663a508..6ee120d3386 100644
--- a/dep/include/zthread/FairReadWriteLock.h
+++ b/dep/include/zthread/FairReadWriteLock.h
@@ -181,3 +181,4 @@ namespace ZThread {
 }; // __ZTFAIRREADWRITELOCK_H__
 
 #endif
+
diff --git a/dep/include/zthread/FastMutex.h b/dep/include/zthread/FastMutex.h
index 819108b377a..e41f34d98e1 100644
--- a/dep/include/zthread/FastMutex.h
+++ b/dep/include/zthread/FastMutex.h
@@ -109,3 +109,4 @@ namespace ZThread {
 };
 
 #endif // __ZTFASTMUTEX_H__
+
diff --git a/dep/include/zthread/FastRecursiveMutex.h b/dep/include/zthread/FastRecursiveMutex.h
index 5a3322e3c65..d94c9ee14da 100644
--- a/dep/include/zthread/FastRecursiveMutex.h
+++ b/dep/include/zthread/FastRecursiveMutex.h
@@ -104,3 +104,4 @@ namespace ZThread {
 } // namespace ZThread
 
 #endif // __ZTFASTRECURSIVEMUTEX_H__
+
diff --git a/dep/include/zthread/Guard.h b/dep/include/zthread/Guard.h
index d1befccd85a..eac332535b9 100644
--- a/dep/include/zthread/Guard.h
+++ b/dep/include/zthread/Guard.h
@@ -509,3 +509,4 @@ Guard<LockType, LockingPolicy>::~Guard() throw() {
 
 
 
+
diff --git a/dep/include/zthread/GuardedClass.h b/dep/include/zthread/GuardedClass.h
index 1a8ac1904df..f5665fd7a52 100644
--- a/dep/include/zthread/GuardedClass.h
+++ b/dep/include/zthread/GuardedClass.h
@@ -101,3 +101,4 @@ namespace ZThread {
 } // namespace ZThread
 
 #endif // __ZTGUARDEDCLASS_H__
+
diff --git a/dep/include/zthread/Lockable.h b/dep/include/zthread/Lockable.h
index a663498bc2c..a8546a36213 100644
--- a/dep/include/zthread/Lockable.h
+++ b/dep/include/zthread/Lockable.h
@@ -94,3 +94,4 @@ namespace ZThread {
 } // namespace ZThread
 
 #endif // __ZTLOCKABLE_H__
+
diff --git a/dep/include/zthread/LockedQueue.h b/dep/include/zthread/LockedQueue.h
index 5aae3278406..62d5f792b8a 100644
--- a/dep/include/zthread/LockedQueue.h
+++ b/dep/include/zthread/LockedQueue.h
@@ -195,3 +195,4 @@ namespace ZThread {
 } // namespace ZThread
 
 #endif // __ZTLOCKEDQUEUE_H__
+
diff --git a/dep/include/zthread/MonitoredQueue.h b/dep/include/zthread/MonitoredQueue.h
index 2122b7f7a28..07d7fa6ae28 100644
--- a/dep/include/zthread/MonitoredQueue.h
+++ b/dep/include/zthread/MonitoredQueue.h
@@ -343,3 +343,4 @@ namespace ZThread {
 
 #endif // __ZTMONITOREDQUEUE_H__
 
+
diff --git a/dep/include/zthread/Mutex.h b/dep/include/zthread/Mutex.h
index 6c2c6bd2d3e..a40ac9b4d67 100644
--- a/dep/include/zthread/Mutex.h
+++ b/dep/include/zthread/Mutex.h
@@ -133,3 +133,4 @@ namespace ZThread {
 } // namespace ZThread
 
 #endif // __ZTMUTEX_H__
+
diff --git a/dep/include/zthread/NonCopyable.h b/dep/include/zthread/NonCopyable.h
index 5c33f345f46..f003be50366 100644
--- a/dep/include/zthread/NonCopyable.h
+++ b/dep/include/zthread/NonCopyable.h
@@ -58,3 +58,4 @@ namespace ZThread {
 } // namespace ZThread
 
 #endif // __ZTNONCOPYABLE_H__
+
diff --git a/dep/include/zthread/PoolExecutor.h b/dep/include/zthread/PoolExecutor.h
index 03df37d9f77..6776381def4 100644
--- a/dep/include/zthread/PoolExecutor.h
+++ b/dep/include/zthread/PoolExecutor.h
@@ -176,3 +176,4 @@ namespace ZThread {
 
 
 
+
diff --git a/dep/include/zthread/Priority.h b/dep/include/zthread/Priority.h
index 907d1f153a8..b34eb1ca3ff 100644
--- a/dep/include/zthread/Priority.h
+++ b/dep/include/zthread/Priority.h
@@ -37,3 +37,4 @@ namespace ZThread {
 }
 
 #endif // __ZTPRIORITY_H__
+
diff --git a/dep/include/zthread/PriorityCondition.h b/dep/include/zthread/PriorityCondition.h
index a85a000e941..caf77e488a0 100644
--- a/dep/include/zthread/PriorityCondition.h
+++ b/dep/include/zthread/PriorityCondition.h
@@ -87,3 +87,4 @@ namespace ZThread {
 } // namespace ZThread
 
 #endif // __ZTPRIORITYCONDITION_H__
+
diff --git a/dep/include/zthread/PriorityInheritanceMutex.h b/dep/include/zthread/PriorityInheritanceMutex.h
index 81c6109b318..d69b26be0e5 100644
--- a/dep/include/zthread/PriorityInheritanceMutex.h
+++ b/dep/include/zthread/PriorityInheritanceMutex.h
@@ -91,3 +91,4 @@ namespace ZThread {
 } // namespace ZThread
 
 #endif // __ZTPRIORITYINHERITANCEMUTEX_H__
+
diff --git a/dep/include/zthread/PriorityMutex.h b/dep/include/zthread/PriorityMutex.h
index b1279764eea..50165ba4663 100644
--- a/dep/include/zthread/PriorityMutex.h
+++ b/dep/include/zthread/PriorityMutex.h
@@ -84,3 +84,4 @@ namespace ZThread {
 } // namespace ZThread
 
 #endif // __ZTPRIORITYMUTEX_H__
+
diff --git a/dep/include/zthread/PrioritySemaphore.h b/dep/include/zthread/PrioritySemaphore.h
index 887691f72df..ab5f4ac2903 100644
--- a/dep/include/zthread/PrioritySemaphore.h
+++ b/dep/include/zthread/PrioritySemaphore.h
@@ -109,3 +109,4 @@ namespace ZThread {
 } // namespace ZThread
 
 #endif // __ZTPRIORITYSEMAPHORE_H__
+
diff --git a/dep/include/zthread/Queue.h b/dep/include/zthread/Queue.h
index 11a84330b23..9c392ce8bfc 100644
--- a/dep/include/zthread/Queue.h
+++ b/dep/include/zthread/Queue.h
@@ -187,3 +187,4 @@ namespace ZThread {
 } // namespace ZThread
 
 #endif // __ZTQUEUE_H__
+
diff --git a/dep/include/zthread/ReadWriteLock.h b/dep/include/zthread/ReadWriteLock.h
index 38b429b699b..86cfac63baa 100644
--- a/dep/include/zthread/ReadWriteLock.h
+++ b/dep/include/zthread/ReadWriteLock.h
@@ -78,3 +78,4 @@ namespace ZThread {
 }; // __ZTREADWRITELOCK_H__
 
 #endif
+
diff --git a/dep/include/zthread/RecursiveMutex.h b/dep/include/zthread/RecursiveMutex.h
index 25df4484b6b..8c8a7920345 100644
--- a/dep/include/zthread/RecursiveMutex.h
+++ b/dep/include/zthread/RecursiveMutex.h
@@ -121,3 +121,4 @@ namespace ZThread {
 } // namespace ZThread
 
 #endif // __ZTRECURSIVEMUTEX_H__
+
diff --git a/dep/include/zthread/Runnable.h b/dep/include/zthread/Runnable.h
index bfe8d03a58f..35d2c218ee0 100644
--- a/dep/include/zthread/Runnable.h
+++ b/dep/include/zthread/Runnable.h
@@ -56,3 +56,4 @@ namespace ZThread {
 }
 
 #endif // __ZTRUNNABLE_H__
+
diff --git a/dep/include/zthread/Semaphore.h b/dep/include/zthread/Semaphore.h
index b01c77804ba..3ea1dba4e16 100644
--- a/dep/include/zthread/Semaphore.h
+++ b/dep/include/zthread/Semaphore.h
@@ -148,3 +148,4 @@ namespace ZThread {
 } // namespace ZThread
 
 #endif // __ZTSEMAPHORE_H__
+
diff --git a/dep/include/zthread/Singleton.h b/dep/include/zthread/Singleton.h
index b8f0d1ea842..c9711751013 100644
--- a/dep/include/zthread/Singleton.h
+++ b/dep/include/zthread/Singleton.h
@@ -247,3 +247,4 @@ T* Singleton<T, InstantiationPolicy, LockType>::instance() {
 #endif
 
 
+
diff --git a/dep/include/zthread/SynchronousExecutor.h b/dep/include/zthread/SynchronousExecutor.h
index bc9de273c4c..e506e83b376 100644
--- a/dep/include/zthread/SynchronousExecutor.h
+++ b/dep/include/zthread/SynchronousExecutor.h
@@ -124,3 +124,4 @@ namespace ZThread {
 } // namespace ZThread
 
 #endif // __ZTSYNCHRONOUSEXECUTOR_H__
+
diff --git a/dep/include/zthread/Task.h b/dep/include/zthread/Task.h
index 850ab98c043..ed7f630f4be 100644
--- a/dep/include/zthread/Task.h
+++ b/dep/include/zthread/Task.h
@@ -76,3 +76,4 @@ namespace ZThread {
 
 
 
+
diff --git a/dep/include/zthread/Thread.h b/dep/include/zthread/Thread.h
index 23ecd1af4bf..90a318ecfff 100644
--- a/dep/include/zthread/Thread.h
+++ b/dep/include/zthread/Thread.h
@@ -379,3 +379,4 @@ namespace ZThread {
 
 
 
+
diff --git a/dep/include/zthread/ThreadLocal.h b/dep/include/zthread/ThreadLocal.h
index 7cccab4ca69..703f6bce6bf 100644
--- a/dep/include/zthread/ThreadLocal.h
+++ b/dep/include/zthread/ThreadLocal.h
@@ -380,3 +380,4 @@ namespace ZThread {
 } // namespace ZThread
 
 #endif // __ZTTHREADLOCAL_H__
+
diff --git a/dep/include/zthread/ThreadLocalImpl.h b/dep/include/zthread/ThreadLocalImpl.h
index be000dfa695..a53c5d1dde4 100644
--- a/dep/include/zthread/ThreadLocalImpl.h
+++ b/dep/include/zthread/ThreadLocalImpl.h
@@ -106,3 +106,4 @@ namespace ZThread {
 
 #endif
 
+
diff --git a/dep/include/zthread/ThreadedExecutor.h b/dep/include/zthread/ThreadedExecutor.h
index 469a112f6bc..9a52368532c 100644
--- a/dep/include/zthread/ThreadedExecutor.h
+++ b/dep/include/zthread/ThreadedExecutor.h
@@ -134,3 +134,4 @@ namespace ZThread {
 } // namespace ZThread
 
 #endif // __ZTTHREADEDEXECUTOR_H__
+
diff --git a/dep/include/zthread/Time.h b/dep/include/zthread/Time.h
index 374c4fd6bf0..0f6db2153ff 100644
--- a/dep/include/zthread/Time.h
+++ b/dep/include/zthread/Time.h
@@ -223,3 +223,4 @@ const Time& operator-=(const Time& t) {
 } // namespace ZThread
 
 #endif // __ZTTIME_H__
+
diff --git a/dep/include/zthread/Waitable.h b/dep/include/zthread/Waitable.h
index 17260370316..c5cae314b46 100644
--- a/dep/include/zthread/Waitable.h
+++ b/dep/include/zthread/Waitable.h
@@ -92,3 +92,4 @@ namespace ZThread {
 } // namespace ZThread
 
 #endif //  __ZTWAITABLE_H__
+
diff --git a/dep/include/zthread/ZThread.h b/dep/include/zthread/ZThread.h
index 1df5bb67a7c..61a7027eeb2 100644
--- a/dep/include/zthread/ZThread.h
+++ b/dep/include/zthread/ZThread.h
@@ -65,3 +65,4 @@
 #include "zthread/Waitable.h"
 
 #endif
+