--- ZThread-2.3.2/src/MutexImpl.h.orig	2005-03-13 04:59:15.000000000 +0100
+++ ZThread-2.3.2/src/MutexImpl.h	2008-09-10 18:19:39.448986470 +0200
@@ -153,7 +153,7 @@ void MutexImpl<List, Behavior>::acquire(
 
       _owner = self;
 
-      ownerAcquired(self);
+      Behavior::ownerAcquired(self);
       
     }
 
@@ -164,7 +164,7 @@ void MutexImpl<List, Behavior>::acquire(
       _waiters.insert(self);
       m.acquire();
 
-      waiterArrived(self);
+      Behavior::waiterArrived(self);
 
       {        
       
@@ -173,7 +173,7 @@ void MutexImpl<List, Behavior>::acquire(
       
       }
 
-      waiterDeparted(self);
+      Behavior::waiterDeparted(self);
 
       m.release();
         
@@ -192,7 +192,7 @@ void MutexImpl<List, Behavior>::acquire(
           assert(_owner == 0);
           _owner = self;    
 
-          ownerAcquired(self);
+	  Behavior::ownerAcquired(self);
 
           break;
         
@@ -236,7 +236,7 @@ bool MutexImpl<List, Behavior>::tryAcqui
 
       _owner = self;
 
-      ownerAcquired(self);
+      Behavior::ownerAcquired(self);
       
     }
 
@@ -253,7 +253,7 @@ bool MutexImpl<List, Behavior>::tryAcqui
       
         m.acquire();
 
-        waiterArrived(self);
+	Behavior::waiterArrived(self);
       
         {
         
@@ -262,7 +262,7 @@ bool MutexImpl<List, Behavior>::tryAcqui
         
         }
 
-        waiterDeparted(self);
+	Behavior::waiterDeparted(self);
       
         m.release();
         
@@ -284,7 +284,7 @@ bool MutexImpl<List, Behavior>::tryAcqui
           assert(0 == _owner);
           _owner = self;
 
-          ownerAcquired(self);
+	  Behavior::ownerAcquired(self);
         
           break;
         
@@ -326,7 +326,7 @@ void MutexImpl<List, Behavior>::release(
 
     _owner = 0;
 
-    ownerReleased(impl);
+    Behavior::ownerReleased(impl);
   
     // Try to find a waiter with a backoff & retry scheme
     for(;;) {
--- ZThread-2.3.2/include/zthread/Guard.h.orig	2005-03-13 03:10:09.000000000 +0100
+++ ZThread-2.3.2/include/zthread/Guard.h	2008-09-10 18:14:58.176983956 +0200
@@ -491,7 +491,7 @@ Guard<LockType, LockingPolicy>::~Guard()
     
   try {
     
-    if(!isDisabled())
+    if(!LockHolder<LockType>::isDisabled())
       LockingPolicy::destroyScope(*this);
     
   } catch (...) { /* ignore */ }