Merge branch 'master' into symbolic-atom-constants

This commit is contained in:
Axel Kohlmeyer
2020-09-15 14:58:13 -04:00
459 changed files with 11521 additions and 10514 deletions

View File

@ -2257,8 +2257,8 @@ void CommTiled::deallocate_swap(int n)
return # of bytes of allocated memory
------------------------------------------------------------------------- */
bigint CommTiled::memory_usage()
double CommTiled::memory_usage()
{
bigint bytes = 0;
double bytes = 0;
return bytes;
}