diff options
Diffstat (limited to 'multimedia/mediatomb/mediatomb-0.12.1-gcc47.patch')
| -rw-r--r-- | multimedia/mediatomb/mediatomb-0.12.1-gcc47.patch | 120 |
1 files changed, 0 insertions, 120 deletions
diff --git a/multimedia/mediatomb/mediatomb-0.12.1-gcc47.patch b/multimedia/mediatomb/mediatomb-0.12.1-gcc47.patch deleted file mode 100644 index 5c4687d15a..0000000000 --- a/multimedia/mediatomb/mediatomb-0.12.1-gcc47.patch +++ /dev/null @@ -1,120 +0,0 @@ -diff --git a/src/hash/dbo_hash.h b/src/hash/dbo_hash.h -index 2e58627..16c15b3 100644 ---- a/src/hash/dbo_hash.h -+++ b/src/hash/dbo_hash.h -@@ -106,7 +106,7 @@ public: - inline bool remove(KT key) - { - struct dbo_hash_slot<KT, VT> *slot; -- if (! search(key, &slot)) -+ if (! this->search(key, &slot)) - return false; - slot->key = deletedKey; - slot->value->release(); -@@ -136,7 +136,7 @@ public: - inline void put(KT key, zmm::Ref<VT> value) - { - struct dbo_hash_slot<KT, VT> *slot; -- search(key, &slot); -+ this->search(key, &slot); - put(key, (hash_slot_t)slot, value); - } - void put(KT key, hash_slot_t destSlot, zmm::Ref<VT> value) -@@ -162,7 +162,7 @@ public: - inline zmm::Ref<VT> get(KT key) - { - struct dbo_hash_slot<KT, VT> *slot; -- bool found = search(key, &slot); -+ bool found = this->search(key, &slot); - if (found) - return zmm::Ref<VT>(slot->value); - else -@@ -174,7 +174,7 @@ public: - inline zmm::Ref<VT> get(KT key, hash_slot_t *destSlot) - { - struct dbo_hash_slot<KT, VT> **slot = (struct dbo_hash_slot<KT, VT> **)destSlot; -- bool found = search(key, slot); -+ bool found = this->search(key, slot); - if (found) - return zmm::Ref<VT>((*slot)->value); - else -diff --git a/src/hash/dbr_hash.h b/src/hash/dbr_hash.h -index 6e65d7f..7028890 100644 ---- a/src/hash/dbr_hash.h -+++ b/src/hash/dbr_hash.h -@@ -124,7 +124,7 @@ public: - inline bool remove(KT key) - { - struct dbr_hash_slot<KT> *slot; -- if (! search(key, &slot)) -+ if (! this->search(key, &slot)) - return false; - slot->key = deletedKey; - int array_slot = slot->array_slot; -@@ -134,7 +134,7 @@ public: - return true; - } - data_array[array_slot] = data_array[--this->count]; -- if (! search(data_array[array_slot], &slot)) -+ if (! this->search(data_array[array_slot], &slot)) - { - log_debug("DBR-Hash-Error: (%d; array_slot=%d; count=%d)\n", data_array[array_slot], array_slot, this->count); - throw zmm::Exception(_("DBR-Hash-Error: key in data_array not found in hashtable")); -@@ -146,7 +146,7 @@ public: - inline void put(KT key) - { - struct dbr_hash_slot<KT> *slot; -- if (! search(key, &slot)) -+ if (! this->search(key, &slot)) - { - #ifdef TOMBDEBUG - if (this->count >= realCapacity) -@@ -194,7 +194,7 @@ public: - inline bool exists(KT key) - { - struct dbr_hash_slot<KT> *slot; -- return search(key, &slot); -+ return this->search(key, &slot); - } - - /* -diff --git a/src/hash/dso_hash.h b/src/hash/dso_hash.h -index adfb97f..03ec852 100644 ---- a/src/hash/dso_hash.h -+++ b/src/hash/dso_hash.h -@@ -100,7 +100,7 @@ public: - inline bool remove(zmm::String key) - { - struct dso_hash_slot<VT> *slot; -- if (! search(key, &slot)) -+ if (! this->search(key, &slot)) - return false; - slot->key->release(); - slot->value->release(); -@@ -112,7 +112,7 @@ public: - inline void put(zmm::String key, zmm::Ref<VT> value) - { - struct dso_hash_slot<VT> *slot; -- search(key, &slot); -+ this->search(key, &slot); - put(key, (hash_slot_t)slot, value); - } - void put(zmm::String key, hash_slot_t destSlot, zmm::Ref<VT> value) -@@ -141,7 +141,7 @@ public: - inline zmm::Ref<VT> get(zmm::String key) - { - struct dso_hash_slot<VT> *slot; -- bool found = search(key, &slot); -+ bool found = this->search(key, &slot); - if (found) - return zmm::Ref<VT>(slot->value); - else -@@ -153,7 +153,7 @@ public: - inline zmm::Ref<VT> get(zmm::String key, hash_slot_t *destSlot) - { - struct dso_hash_slot<VT> **slot = (struct dso_hash_slot<VT> **)destSlot; -- bool found = search(key, slot); -+ bool found = this->search(key, slot); - if (found) - return zmm::Ref<VT>((*slot)->value); - else |