*Merge.

--HG--
branch : trunk

1 files changed, 11 insertions, 11 deletions

diff --git a/dep/src/zthread/ThreadLocalImpl.cxx b/dep/src/zthread/ThreadLocalImpl.cxx
index 25682e66325..502a70734dc 100644
--- a/dep/src/zthread/ThreadLocalImpl.cxx
+++ b/dep/src/zthread/ThreadLocalImpl.cxx
@@ -27,13 +27,13 @@ namespace ZThread {
 
   ThreadLocalImpl::ThreadLocalImpl() {}
 
-  ThreadLocalImpl::~ThreadLocalImpl() {} 
-  
+  ThreadLocalImpl::~ThreadLocalImpl() {}
+
   void ThreadLocalImpl::clearAll() {
 
     typedef ThreadImpl::ThreadLocalMap Map;
     Map& m = ThreadImpl::current()->getThreadLocalMap();
-    
+
     m.clear();
 
   }
@@ -42,25 +42,25 @@ namespace ZThread {
 
     typedef ThreadImpl::ThreadLocalMap Map;
     Map& m = ThreadImpl::current()->getThreadLocalMap();
-    
+
     Map::iterator i = m.find(this);
-    if(i != m.end()) 
+    if(i != m.end())
       m.erase(i);
 
-  } 
+  }
 
   ThreadLocalImpl::ValuePtr ThreadLocalImpl::value( ValuePtr(*pfn)() ) const {
-     
+
     typedef ThreadImpl::ThreadLocalMap Map;
     Map& m = ThreadImpl::current()->getThreadLocalMap();
-    
+
     Map::iterator i = m.find(this);
-    if(i != m.end()) 
+    if(i != m.end())
       return i->second;
-    
+
     m[ this ] = ValuePtr( pfn() );
     return m[ this ];
 
   }
 
-} // namespace ZThread 
+} // namespace ZThread