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

@ -380,9 +380,9 @@ void AtomVecLine::data_atom_bonus(int m, char **values)
return # of bytes of allocated bonus memory
------------------------------------------------------------------------- */
bigint AtomVecLine::memory_usage_bonus()
double AtomVecLine::memory_usage_bonus()
{
bigint bytes = 0;
double bytes = 0;
bytes += nmax_bonus*sizeof(Bonus);
return bytes;
}