mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-25 03:17:13 +00:00
26 lines
1,014 B
Diff
26 lines
1,014 B
Diff
|
diff -u --label /tmp/Coin-3.1.3/src/misc/SbHash.h --label \#\<buffer\ SbHash.h\> /tmp/Coin-3.1.3/src/misc/SbHash.h /tmp/buffer-content-21756V0
|
||
|
|
--- a/src/misc/SbHash.h
|
||
|
|
+++ b/src/misc/SbHash.h
|
||
|
|
@@ -88,8 +88,8 @@
|
||
|
|
SbHashEntry<Type, Key> * entry = static_cast<SbHashEntry<Type, Key> *>( ptr);
|
||
|
|
cc_memalloc_deallocate(entry->memhandler, ptr);
|
||
|
|
}
|
||
|
|
- SbHashEntry(const Key & key, const Type & obj) : key(key), obj(obj) {}
|
||
|
|
-
|
||
|
|
+ SbHashEntry(const Key & key, const Type & obj, cc_memalloc *memhandler)
|
||
|
|
+ : key(key), obj(obj), memhandler(memhandler) {}
|
||
|
|
Key key;
|
||
|
|
Type obj;
|
||
|
|
SbHashEntry<Type, Key> * next;
|
||
|
|
@@ -218,7 +218,7 @@
|
||
|
|
/* Key not already in the hash table; insert a new
|
||
|
|
* entry as the first element in the bucket
|
||
|
|
*/
|
||
|
|
- entry = new (this->memhandler) SbHashEntry<Type, Key>(key, obj);
|
||
|
|
+ entry = new (this->memhandler) SbHashEntry<Type, Key>(key, obj, this->memhandler);
|
||
|
|
entry->next = this->buckets[i];
|
||
|
|
this->buckets[i] = entry;
|
||
|
|
|
||
|
|
|
||
|
|
Diff finished. Sat Sep 9 19:50:32 2017
|