Merge branch 'master' into consistent-memory-usage

This commit is contained in:
Axel Kohlmeyer
2020-09-15 12:25:16 -04:00
45 changed files with 1287 additions and 501 deletions

View File

@ -331,7 +331,7 @@ class Atom : protected Pointers {
virtual void sync_modify(ExecutionSpace, unsigned int, unsigned int) {}
void *extract(char *);
void *extract(const char *);
inline int* get_map_array() {return map_array;};
inline int get_map_size() {return map_tag_max+1;};