1
Description: Fix a FTBFS when using gcc-4.7
2
Origin: other, http://pkgs.fedoraproject.org/gitweb/?p=mediatomb.git;a=commitdiff;h=b96e8410
3
Last-Update: 2012-03-03
5
diff -up ./src/hash/dbo_hash.h.gcc47 ./src/hash/dbo_hash.h
6
--- ./src/hash/dbo_hash.h.gcc47 2012-01-14 11:55:22.520261056 -0500
7
+++ ./src/hash/dbo_hash.h 2012-01-14 12:01:48.965302982 -0500
8
@@ -106,7 +106,7 @@ public:
9
inline bool remove(KT key)
11
struct dbo_hash_slot<KT, VT> *slot;
12
- if (! search(key, &slot))
13
+ if (! this->search(key, &slot))
15
slot->key = deletedKey;
16
slot->value->release();
17
@@ -136,7 +136,7 @@ public:
18
inline void put(KT key, zmm::Ref<VT> value)
20
struct dbo_hash_slot<KT, VT> *slot;
22
+ this->search(key, &slot);
23
put(key, (hash_slot_t)slot, value);
25
void put(KT key, hash_slot_t destSlot, zmm::Ref<VT> value)
26
@@ -162,7 +162,7 @@ public:
27
inline zmm::Ref<VT> get(KT key)
29
struct dbo_hash_slot<KT, VT> *slot;
30
- bool found = search(key, &slot);
31
+ bool found = this->search(key, &slot);
33
return zmm::Ref<VT>(slot->value);
35
@@ -174,7 +174,7 @@ public:
36
inline zmm::Ref<VT> get(KT key, hash_slot_t *destSlot)
38
struct dbo_hash_slot<KT, VT> **slot = (struct dbo_hash_slot<KT, VT> **)destSlot;
39
- bool found = search(key, slot);
40
+ bool found = this->search(key, slot);
42
return zmm::Ref<VT>((*slot)->value);
44
diff -up ./src/hash/dbr_hash.h.gcc47 ./src/hash/dbr_hash.h
45
--- ./src/hash/dbr_hash.h.gcc47 2012-01-14 12:04:43.464643618 -0500
46
+++ ./src/hash/dbr_hash.h 2012-01-14 12:05:24.111120552 -0500
47
@@ -124,7 +124,7 @@ public:
48
inline bool remove(KT key)
50
struct dbr_hash_slot<KT> *slot;
51
- if (! search(key, &slot))
52
+ if (! this->search(key, &slot))
54
slot->key = deletedKey;
55
int array_slot = slot->array_slot;
56
@@ -134,7 +134,7 @@ public:
59
data_array[array_slot] = data_array[--this->count];
60
- if (! search(data_array[array_slot], &slot))
61
+ if (! this->search(data_array[array_slot], &slot))
63
log_debug("DBR-Hash-Error: (%d; array_slot=%d; count=%d)\n", data_array[array_slot], array_slot, this->count);
64
throw zmm::Exception(_("DBR-Hash-Error: key in data_array not found in hashtable"));
65
@@ -146,7 +146,7 @@ public:
66
inline void put(KT key)
68
struct dbr_hash_slot<KT> *slot;
69
- if (! search(key, &slot))
70
+ if (! this->search(key, &slot))
73
if (this->count >= realCapacity)
74
@@ -194,7 +194,7 @@ public:
75
inline bool exists(KT key)
77
struct dbr_hash_slot<KT> *slot;
78
- return search(key, &slot);
79
+ return this->search(key, &slot);
83
diff -up ./src/hash/dso_hash.h.gcc47 ./src/hash/dso_hash.h
84
--- ./src/hash/dso_hash.h.gcc47 2012-01-14 12:13:50.755582375 -0500
85
+++ ./src/hash/dso_hash.h 2012-01-14 12:14:42.511463035 -0500
86
@@ -100,7 +100,7 @@ public:
87
inline bool remove(zmm::String key)
89
struct dso_hash_slot<VT> *slot;
90
- if (! search(key, &slot))
91
+ if (! this->search(key, &slot))
94
slot->value->release();
95
@@ -112,7 +112,7 @@ public:
96
inline void put(zmm::String key, zmm::Ref<VT> value)
98
struct dso_hash_slot<VT> *slot;
100
+ this->search(key, &slot);
101
put(key, (hash_slot_t)slot, value);
103
void put(zmm::String key, hash_slot_t destSlot, zmm::Ref<VT> value)
104
@@ -141,7 +141,7 @@ public:
105
inline zmm::Ref<VT> get(zmm::String key)
107
struct dso_hash_slot<VT> *slot;
108
- bool found = search(key, &slot);
109
+ bool found = this->search(key, &slot);
111
return zmm::Ref<VT>(slot->value);
113
@@ -153,7 +153,7 @@ public:
114
inline zmm::Ref<VT> get(zmm::String key, hash_slot_t *destSlot)
116
struct dso_hash_slot<VT> **slot = (struct dso_hash_slot<VT> **)destSlot;
117
- bool found = search(key, slot);
118
+ bool found = this->search(key, slot);
120
return zmm::Ref<VT>((*slot)->value);