Merge branch 'master' into consistent-memory-usage
This commit is contained in:
@ -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;};
|
||||
|
||||
Reference in New Issue
Block a user