From 90a1c3817bd979d30eef880f5cbbdab1fdc96b69 Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Sat, 13 Oct 2018 14:03:53 +0200 Subject: 20181013.1 global branch merge. Signed-off-by: Matteo Bernardini --- development/Coin/memhandler-initialization.patch | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 development/Coin/memhandler-initialization.patch (limited to 'development/Coin/memhandler-initialization.patch') diff --git a/development/Coin/memhandler-initialization.patch b/development/Coin/memhandler-initialization.patch new file mode 100644 index 0000000000..4c346487ed --- /dev/null +++ b/development/Coin/memhandler-initialization.patch @@ -0,0 +1,20 @@ +--- Coin-3.1.3/src/misc/SbHash.h.init 2010-03-02 22:20:09.000000000 +0900 ++++ Coin-3.1.3/src/misc/SbHash.h 2016-04-22 16:52:39.888883757 +0900 +@@ -89,6 +89,8 @@ + 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; +@@ -218,7 +220,7 @@ + /* Key not already in the hash table; insert a new + * entry as the first element in the bucket + */ +- entry = new (this->memhandler) SbHashEntry(key, obj); ++ entry = new (this->memhandler) SbHashEntry(key, obj, this->memhandler); + entry->next = this->buckets[i]; + this->buckets[i] = entry; + -- cgit v1.2.3