X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=nucleus%2Flibrary%2Fstructures%2Fmemory_limiter.cpp;h=b1ec18cca1b0e194377d27f77c54df574bb37d43;hb=c126508114a6713d0102a0b4804a9f25bd46b6bf;hp=b0756a8aff7689e72b7331220759abb1a105ca91;hpb=457b128b77b5b4a0b7dd3094de543de2ce1477ad;p=feisty_meow.git diff --git a/nucleus/library/structures/memory_limiter.cpp b/nucleus/library/structures/memory_limiter.cpp index b0756a8a..b1ec18cc 100644 --- a/nucleus/library/structures/memory_limiter.cpp +++ b/nucleus/library/structures/memory_limiter.cpp @@ -68,8 +68,8 @@ const int_set &memory_limiter::individuals_listed() const ml_memory_record *memory_limiter::find_individual(int individual) const { - ml_memory_record *to_return = NIL; - if (!_individual_sizes->find(individual, to_return)) return NIL; + ml_memory_record *to_return = NULL_POINTER; + if (!_individual_sizes->find(individual, to_return)) return NULL_POINTER; // no record for that guy. return to_return; } @@ -126,7 +126,7 @@ astring memory_limiter::text_form(int indent) const bool memory_limiter::okay_allocation(int individual, int memory_desired) { -// FUNCDEF("okay_allocation"); + FUNCDEF("okay_allocation"); // check the overall allocation limits first. if (_overall_limit && (_overall_size + memory_desired > _overall_limit) ) return false;