/[gentoo-x86]/net-misc/mediatomb/files/mediatomb-0.12.1-gcc47.patch
Gentoo

Contents of /net-misc/mediatomb/files/mediatomb-0.12.1-gcc47.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Tue Dec 17 23:39:27 2013 UTC (10 months ago) by thev00d00
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
Bump to -r7, tidy up ebuild, remove old, add flac and youtube patches, epatch_user #467110 #494398

(Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit)

1 diff --git a/src/hash/dbo_hash.h b/src/hash/dbo_hash.h
2 index 2e58627..16c15b3 100644
3 --- a/src/hash/dbo_hash.h
4 +++ b/src/hash/dbo_hash.h
5 @@ -106,7 +106,7 @@ public:
6 inline bool remove(KT key)
7 {
8 struct dbo_hash_slot<KT, VT> *slot;
9 - if (! search(key, &slot))
10 + if (! this->search(key, &slot))
11 return false;
12 slot->key = deletedKey;
13 slot->value->release();
14 @@ -136,7 +136,7 @@ public:
15 inline void put(KT key, zmm::Ref<VT> value)
16 {
17 struct dbo_hash_slot<KT, VT> *slot;
18 - search(key, &slot);
19 + this->search(key, &slot);
20 put(key, (hash_slot_t)slot, value);
21 }
22 void put(KT key, hash_slot_t destSlot, zmm::Ref<VT> value)
23 @@ -162,7 +162,7 @@ public:
24 inline zmm::Ref<VT> get(KT key)
25 {
26 struct dbo_hash_slot<KT, VT> *slot;
27 - bool found = search(key, &slot);
28 + bool found = this->search(key, &slot);
29 if (found)
30 return zmm::Ref<VT>(slot->value);
31 else
32 @@ -174,7 +174,7 @@ public:
33 inline zmm::Ref<VT> get(KT key, hash_slot_t *destSlot)
34 {
35 struct dbo_hash_slot<KT, VT> **slot = (struct dbo_hash_slot<KT, VT> **)destSlot;
36 - bool found = search(key, slot);
37 + bool found = this->search(key, slot);
38 if (found)
39 return zmm::Ref<VT>((*slot)->value);
40 else
41 diff --git a/src/hash/dbr_hash.h b/src/hash/dbr_hash.h
42 index 6e65d7f..7028890 100644
43 --- a/src/hash/dbr_hash.h
44 +++ b/src/hash/dbr_hash.h
45 @@ -124,7 +124,7 @@ public:
46 inline bool remove(KT key)
47 {
48 struct dbr_hash_slot<KT> *slot;
49 - if (! search(key, &slot))
50 + if (! this->search(key, &slot))
51 return false;
52 slot->key = deletedKey;
53 int array_slot = slot->array_slot;
54 @@ -134,7 +134,7 @@ public:
55 return true;
56 }
57 data_array[array_slot] = data_array[--this->count];
58 - if (! search(data_array[array_slot], &slot))
59 + if (! this->search(data_array[array_slot], &slot))
60 {
61 log_debug("DBR-Hash-Error: (%d; array_slot=%d; count=%d)\n", data_array[array_slot], array_slot, this->count);
62 throw zmm::Exception(_("DBR-Hash-Error: key in data_array not found in hashtable"));
63 @@ -146,7 +146,7 @@ public:
64 inline void put(KT key)
65 {
66 struct dbr_hash_slot<KT> *slot;
67 - if (! search(key, &slot))
68 + if (! this->search(key, &slot))
69 {
70 #ifdef TOMBDEBUG
71 if (this->count >= realCapacity)
72 @@ -194,7 +194,7 @@ public:
73 inline bool exists(KT key)
74 {
75 struct dbr_hash_slot<KT> *slot;
76 - return search(key, &slot);
77 + return this->search(key, &slot);
78 }
79
80 /*
81 diff --git a/src/hash/dso_hash.h b/src/hash/dso_hash.h
82 index adfb97f..03ec852 100644
83 --- a/src/hash/dso_hash.h
84 +++ b/src/hash/dso_hash.h
85 @@ -100,7 +100,7 @@ public:
86 inline bool remove(zmm::String key)
87 {
88 struct dso_hash_slot<VT> *slot;
89 - if (! search(key, &slot))
90 + if (! this->search(key, &slot))
91 return false;
92 slot->key->release();
93 slot->value->release();
94 @@ -112,7 +112,7 @@ public:
95 inline void put(zmm::String key, zmm::Ref<VT> value)
96 {
97 struct dso_hash_slot<VT> *slot;
98 - search(key, &slot);
99 + this->search(key, &slot);
100 put(key, (hash_slot_t)slot, value);
101 }
102 void put(zmm::String key, hash_slot_t destSlot, zmm::Ref<VT> value)
103 @@ -141,7 +141,7 @@ public:
104 inline zmm::Ref<VT> get(zmm::String key)
105 {
106 struct dso_hash_slot<VT> *slot;
107 - bool found = search(key, &slot);
108 + bool found = this->search(key, &slot);
109 if (found)
110 return zmm::Ref<VT>(slot->value);
111 else
112 @@ -153,7 +153,7 @@ public:
113 inline zmm::Ref<VT> get(zmm::String key, hash_slot_t *destSlot)
114 {
115 struct dso_hash_slot<VT> **slot = (struct dso_hash_slot<VT> **)destSlot;
116 - bool found = search(key, slot);
117 + bool found = this->search(key, slot);
118 if (found)
119 return zmm::Ref<VT>((*slot)->value);
120 else

  ViewVC Help
Powered by ViewVC 1.1.20