~dlh/armagetronad/os-x-toolkit

« back to all changes in this revision

Viewing changes to patches/ZThread.patch

  • Committer: Daniel Lee Harple
  • Date: 2019-11-02 05:13:04 UTC
  • Revision ID: leeharple@gmail.com-20191102051304-dja2hf43mli1jjt3
Update libraries

* Use 10.3 SDK
* Add SDL 1.2 libraries. Only one of SDL1 or SDL2 can be installed in the
  toolkit.

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
diff -ur a/include/zthread/Guard.h b/include/zthread/Guard.h
 
2
--- a/include/zthread/Guard.h   2005-03-12 21:10:09.000000000 -0500
 
3
+++ b/include/zthread/Guard.h   2019-10-29 21:11:56.000000000 -0400
 
4
@@ -114,11 +114,11 @@
 
5
       if(!Scope2::createScope(l, ms)) {
 
6
 
 
7
         Scope1::destroyScope(l);
 
8
-        return false;
 
9
+        return;
 
10
 
 
11
       }
 
12
        
 
13
-    return true;
 
14
+    return;
 
15
 
 
16
   }
 
17
 
 
18
@@ -428,7 +428,7 @@
 
19
   template <class U, class V>
 
20
   Guard(Guard<U, V>& g) : LockHolder<LockType>(g) {
 
21
 
 
22
-    LockingPolicy::shareScope(*this, extract(g));
 
23
+    LockingPolicy::shareScope(*this, this->extract(g));
 
24
     
 
25
   }
 
26
 
 
27
@@ -491,7 +491,7 @@
 
28
     
 
29
   try {
 
30
     
 
31
-    if(!isDisabled())
 
32
+    if(!this->isDisabled())
 
33
       LockingPolicy::destroyScope(*this);
 
34
     
 
35
   } catch (...) { /* ignore */ }  
 
36
diff -ur a/src/MutexImpl.h b/src/MutexImpl.h
 
37
--- a/src/MutexImpl.h   2005-03-12 22:59:15.000000000 -0500
 
38
+++ b/src/MutexImpl.h   2019-10-29 21:14:40.000000000 -0400
 
39
@@ -153,7 +153,7 @@
 
40
 
 
41
       _owner = self;
 
42
 
 
43
-      ownerAcquired(self);
 
44
+      this->ownerAcquired(self);
 
45
       
 
46
     }
 
47
 
 
48
@@ -164,7 +164,7 @@
 
49
       _waiters.insert(self);
 
50
       m.acquire();
 
51
 
 
52
-      waiterArrived(self);
 
53
+      this->waiterArrived(self);
 
54
 
 
55
       {        
 
56
       
 
57
@@ -173,7 +173,7 @@
 
58
       
 
59
       }
 
60
 
 
61
-      waiterDeparted(self);
 
62
+      this->waiterDeparted(self);
 
63
 
 
64
       m.release();
 
65
         
 
66
@@ -192,7 +192,7 @@
 
67
           assert(_owner == 0);
 
68
           _owner = self;    
 
69
 
 
70
-          ownerAcquired(self);
 
71
+          this->ownerAcquired(self);
 
72
 
 
73
           break;
 
74
         
 
75
@@ -236,7 +236,7 @@
 
76
 
 
77
       _owner = self;
 
78
 
 
79
-      ownerAcquired(self);
 
80
+      this->ownerAcquired(self);
 
81
       
 
82
     }
 
83
 
 
84
@@ -253,7 +253,7 @@
 
85
       
 
86
         m.acquire();
 
87
 
 
88
-        waiterArrived(self);
 
89
+        this->waiterArrived(self);
 
90
       
 
91
         {
 
92
         
 
93
@@ -262,7 +262,7 @@
 
94
         
 
95
         }
 
96
 
 
97
-        waiterDeparted(self);
 
98
+        this->waiterDeparted(self);
 
99
       
 
100
         m.release();
 
101
         
 
102
@@ -284,7 +284,7 @@
 
103
           assert(0 == _owner);
 
104
           _owner = self;
 
105
 
 
106
-          ownerAcquired(self);
 
107
+          this->ownerAcquired(self);
 
108
         
 
109
           break;
 
110
         
 
111
@@ -326,7 +326,7 @@
 
112
 
 
113
     _owner = 0;
 
114
 
 
115
-    ownerReleased(impl);
 
116
+    this->ownerReleased(impl);
 
117
   
 
118
     // Try to find a waiter with a backoff & retry scheme
 
119
     for(;;) {