zthread-gcc4.patch

   1 diff -ru ZThread-2.3.2-old/include/zthread/Guard.h ZThread-2.3.2/include/zthread/Guard.h
   2 --- ZThread-2.3.2-old/include/zthread/Guard.h   2005-03-12 21:10:09.000000000 -0500
   3 +++ ZThread-2.3.2/include/zthread/Guard.h       2006-09-10 14:10:08.000000000 -0400
   4 @@ -491,7 +491,7 @@
   5
   6    try {
   7
   8 -    if(!isDisabled())
   9 +    if(!LockHolder<LockType>::isDisabled())
  10        LockingPolicy::destroyScope(*this);
  11
  12    } catch (...) { /* ignore */ }
  13 diff -ru ZThread-2.3.2-old/src/MutexImpl.h ZThread-2.3.2/src/MutexImpl.h
  14 --- ZThread-2.3.2-old/src/MutexImpl.h   2005-03-12 22:59:15.000000000 -0500
  15 +++ ZThread-2.3.2/src/MutexImpl.h       2006-09-10 14:13:31.000000000 -0400
  16 @@ -153,7 +153,7 @@
  17
  18        _owner = self;
  19
  20 -      ownerAcquired(self);
  21 +      Behavior::ownerAcquired(self);
  22
  23      }
  24
  25 @@ -164,7 +164,7 @@
  26        _waiters.insert(self);
  27        m.acquire();
  28
  29 -      waiterArrived(self);
  30 +      Behavior::waiterArrived(self);
  31
  32        {
  33
  34 @@ -173,7 +173,7 @@
  35
  36        }
  37
  38 -      waiterDeparted(self);
  39 +      Behavior::waiterDeparted(self);
  40
  41        m.release();
  42
  43 @@ -192,7 +192,7 @@
  44            assert(_owner == 0);
  45            _owner = self;
  46
  47 -          ownerAcquired(self);
  48 +          Behavior::ownerAcquired(self);
  49
  50            break;
  51
  52 @@ -236,7 +236,7 @@
  53
  54        _owner = self;
  55
  56 -      ownerAcquired(self);
  57 +      Behavior::ownerAcquired(self);
  58
  59      }
  60
  61 @@ -253,7 +253,7 @@
  62
  63          m.acquire();
  64
  65 -        waiterArrived(self);
  66 +        Behavior::waiterArrived(self);
  67
  68          {
  69
  70 @@ -262,7 +262,7 @@
  71
  72          }
  73
  74 -        waiterDeparted(self);
  75 +        Behavior::waiterDeparted(self);
  76
  77          m.release();
  78
  79 @@ -284,7 +284,7 @@
  80            assert(0 == _owner);
  81            _owner = self;
  82
  83 -          ownerAcquired(self);
  84 +          Behavior::ownerAcquired(self);
  85
  86            break;
  87
  88 @@ -326,7 +326,7 @@
  89
  90      _owner = 0;
  91
  92 -    ownerReleased(impl);
  93 +    Behavior::ownerReleased(impl);
  94
  95      // Try to find a waiter with a backoff & retry scheme
  96      for(;;) {