TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

putil: fix copy constructor of SimpleHashMap

Browse Source
This commit is contained in:
rdb 2018-01-02 19:07:43 +01:00
parent 92787264de
commit 7ea16fd772
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
panda/src/putil/simpleHashMap.I
View File

@ -41,7 +41,13 @@ SimpleHashMap(const SimpleHashMap &copy) :
_deleted_chain = memory_hook->get_deleted_chain(alloc_size); _deleted_chain = memory_hook->get_deleted_chain(alloc_size);
_table = (TableEntry *)_deleted_chain->allocate(alloc_size, TypeHandle::none()); _table = (TableEntry *)_deleted_chain->allocate(alloc_size, TypeHandle::none());
memcpy(_table, copy._table, alloc_size);
for (size_t i = 0; i < _num_entries; ++i) {
new(&_table[i]) TableEntry(copy._table[i]);
}
// Copy the index array.
memcpy(get_index_array(), copy.get_index_array(), _table_size * sizeof(int) * sparsity);
} }
/** /**
@ -88,7 +94,12 @@ operator = (const SimpleHashMap<Key, Value, Compare> &copy) {
_deleted_chain = memory_hook->get_deleted_chain(alloc_size); _deleted_chain = memory_hook->get_deleted_chain(alloc_size);
_table = (TableEntry *)_deleted_chain->allocate(alloc_size, TypeHandle::none()); _table = (TableEntry *)_deleted_chain->allocate(alloc_size, TypeHandle::none());
memcpy(_table, copy._table, alloc_size); for (size_t i = 0; i < _num_entries; ++i) {
new(&_table[i]) TableEntry(copy._table[i]);
}
// Copy the index array.
memcpy(get_index_array(), copy.get_index_array(), _table_size * sizeof(int) * sparsity);
} }
return *this; return *this;
} }