1 |
halcy0n 09/04/19 20:00:35 |
2 |
|
3 |
Added: zthread-2.3.2-no-fpermissive.diff |
4 |
Log: |
5 |
Patch so that -fpermissive is not needed to build. Thanks to Wilfried Holzke <gentoo AT holzke DOT net>; bug #232645 |
6 |
(Portage version: 2.2_rc30/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 dev-libs/zthread/files/zthread-2.3.2-no-fpermissive.diff |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/zthread/files/zthread-2.3.2-no-fpermissive.diff?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/zthread/files/zthread-2.3.2-no-fpermissive.diff?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: zthread-2.3.2-no-fpermissive.diff |
15 |
=================================================================== |
16 |
--- include/zthread/Guard.h.orig 2008-07-22 14:46:28.000000000 +0200 |
17 |
+++ include/zthread/Guard.h 2008-07-22 14:51:41.000000000 +0200 |
18 |
@@ -491,7 +491,7 @@ |
19 |
|
20 |
try { |
21 |
|
22 |
- if(!isDisabled()) |
23 |
+ if(!LockHolder<LockType>::isDisabled()) |
24 |
LockingPolicy::destroyScope(*this); |
25 |
|
26 |
} catch (...) { /* ignore */ } |
27 |
--- src/MutexImpl.h.orig 2008-07-22 14:54:40.000000000 +0200 |
28 |
+++ src/MutexImpl.h 2008-07-22 15:03:30.000000000 +0200 |
29 |
@@ -153,7 +153,7 @@ |
30 |
|
31 |
_owner = self; |
32 |
|
33 |
- ownerAcquired(self); |
34 |
+ MutexImpl<List,Behavior>::ownerAcquired(self); |
35 |
|
36 |
} |
37 |
|
38 |
@@ -164,7 +164,7 @@ |
39 |
_waiters.insert(self); |
40 |
m.acquire(); |
41 |
|
42 |
- waiterArrived(self); |
43 |
+ MutexImpl<List, Behavior>::waiterArrived(self); |
44 |
|
45 |
{ |
46 |
|
47 |
@@ -173,7 +173,7 @@ |
48 |
|
49 |
} |
50 |
|
51 |
- waiterDeparted(self); |
52 |
+ MutexImpl<List, Behavior>::waiterDeparted(self); |
53 |
|
54 |
m.release(); |
55 |
|
56 |
@@ -192,7 +192,7 @@ |
57 |
assert(_owner == 0); |
58 |
_owner = self; |
59 |
|
60 |
- ownerAcquired(self); |
61 |
+ MutexImpl<List, Behavior>::ownerAcquired(self); |
62 |
|
63 |
break; |
64 |
|
65 |
@@ -236,7 +236,7 @@ |
66 |
|
67 |
_owner = self; |
68 |
|
69 |
- ownerAcquired(self); |
70 |
+ MutexImpl<List, Behavior>::ownerAcquired(self); |
71 |
|
72 |
} |
73 |
|
74 |
@@ -253,7 +253,7 @@ |
75 |
|
76 |
m.acquire(); |
77 |
|
78 |
- waiterArrived(self); |
79 |
+ MutexImpl<List, Behavior>:: waiterArrived(self); |
80 |
|
81 |
{ |
82 |
|
83 |
@@ -262,7 +262,7 @@ |
84 |
|
85 |
} |
86 |
|
87 |
- waiterDeparted(self); |
88 |
+ MutexImpl<List, Behavior>::waiterDeparted(self); |
89 |
|
90 |
m.release(); |
91 |
|
92 |
@@ -284,7 +284,7 @@ |
93 |
assert(0 == _owner); |
94 |
_owner = self; |
95 |
|
96 |
- ownerAcquired(self); |
97 |
+ MutexImpl<List, Behavior>::ownerAcquired(self); |
98 |
|
99 |
break; |
100 |
|
101 |
@@ -326,7 +326,7 @@ |
102 |
|
103 |
_owner = 0; |
104 |
|
105 |
- ownerReleased(impl); |
106 |
+ MutexImpl<List, Behavior>::ownerReleased(impl); |
107 |
|
108 |
// Try to find a waiter with a backoff & retry scheme |
109 |
for(;;) { |