Merge branch 'master' into symbolic-atom-constants

This commit is contained in:
Axel Kohlmeyer
2020-09-15 17:44:31 -04:00
1186 changed files with 8448 additions and 8360 deletions

View File

@ -326,18 +326,18 @@ int Atom::map_style_set()
void Atom::map_delete()
{
memory->destroy(sametag);
sametag = NULL;
sametag = nullptr;
max_same = 0;
if (map_style == MAP_ARRAY) {
memory->destroy(map_array);
map_array = NULL;
map_array = nullptr;
} else {
if (map_nhash) {
delete [] map_bucket;
delete [] map_hash;
map_bucket = NULL;
map_hash = NULL;
map_bucket = nullptr;
map_hash = nullptr;
}
map_nhash = map_nbucket = 0;
}