Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/zthread/files/
Date: Tue, 23 Apr 2019 09:55:36
Message-Id: 1556013181.12b0efc1f523095036016187079bf534ae1d7431.soap@gentoo
1 commit: 12b0efc1f523095036016187079bf534ae1d7431
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Mon Apr 22 07:55:52 2019 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Tue Apr 23 09:53:01 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12b0efc1
7
8 dev-libs/zthread: remove unused patch
9
10 Closes: https://github.com/gentoo/gentoo/pull/11780
11 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
12 Signed-off-by: David Seifert <soap <AT> gentoo.org>
13
14 .../files/zthread-2.3.2-no-fpermissive.diff | 94 ----------------------
15 1 file changed, 94 deletions(-)
16
17 diff --git a/dev-libs/zthread/files/zthread-2.3.2-no-fpermissive.diff b/dev-libs/zthread/files/zthread-2.3.2-no-fpermissive.diff
18 deleted file mode 100644
19 index 21fad7c52c8..00000000000
20 --- a/dev-libs/zthread/files/zthread-2.3.2-no-fpermissive.diff
21 +++ /dev/null
22 @@ -1,94 +0,0 @@
23 ---- include/zthread/Guard.h.orig 2008-07-22 14:46:28.000000000 +0200
24 -+++ include/zthread/Guard.h 2008-07-22 14:51:41.000000000 +0200
25 -@@ -491,7 +491,7 @@
26 -
27 - try {
28 -
29 -- if(!isDisabled())
30 -+ if(!LockHolder<LockType>::isDisabled())
31 - LockingPolicy::destroyScope(*this);
32 -
33 - } catch (...) { /* ignore */ }
34 ---- src/MutexImpl.h.orig 2008-07-22 14:54:40.000000000 +0200
35 -+++ src/MutexImpl.h 2008-07-22 15:03:30.000000000 +0200
36 -@@ -153,7 +153,7 @@
37 -
38 - _owner = self;
39 -
40 -- ownerAcquired(self);
41 -+ MutexImpl<List,Behavior>::ownerAcquired(self);
42 -
43 - }
44 -
45 -@@ -164,7 +164,7 @@
46 - _waiters.insert(self);
47 - m.acquire();
48 -
49 -- waiterArrived(self);
50 -+ MutexImpl<List, Behavior>::waiterArrived(self);
51 -
52 - {
53 -
54 -@@ -173,7 +173,7 @@
55 -
56 - }
57 -
58 -- waiterDeparted(self);
59 -+ MutexImpl<List, Behavior>::waiterDeparted(self);
60 -
61 - m.release();
62 -
63 -@@ -192,7 +192,7 @@
64 - assert(_owner == 0);
65 - _owner = self;
66 -
67 -- ownerAcquired(self);
68 -+ MutexImpl<List, Behavior>::ownerAcquired(self);
69 -
70 - break;
71 -
72 -@@ -236,7 +236,7 @@
73 -
74 - _owner = self;
75 -
76 -- ownerAcquired(self);
77 -+ MutexImpl<List, Behavior>::ownerAcquired(self);
78 -
79 - }
80 -
81 -@@ -253,7 +253,7 @@
82 -
83 - m.acquire();
84 -
85 -- waiterArrived(self);
86 -+ MutexImpl<List, Behavior>:: waiterArrived(self);
87 -
88 - {
89 -
90 -@@ -262,7 +262,7 @@
91 -
92 - }
93 -
94 -- waiterDeparted(self);
95 -+ MutexImpl<List, Behavior>::waiterDeparted(self);
96 -
97 - m.release();
98 -
99 -@@ -284,7 +284,7 @@
100 - assert(0 == _owner);
101 - _owner = self;
102 -
103 -- ownerAcquired(self);
104 -+ MutexImpl<List, Behavior>::ownerAcquired(self);
105 -
106 - break;
107 -
108 -@@ -326,7 +326,7 @@
109 -
110 - _owner = 0;
111 -
112 -- ownerReleased(impl);
113 -+ MutexImpl<List, Behavior>::ownerReleased(impl);
114 -
115 - // Try to find a waiter with a backoff & retry scheme
116 - for(;;) {