projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dropped unnecessary parameter from remove apache
[feisty_meow.git]
/
nucleus
/
library
/
structures
/
memory_limiter.cpp
diff --git
a/nucleus/library/structures/memory_limiter.cpp
b/nucleus/library/structures/memory_limiter.cpp
index b0756a8aff7689e72b7331220759abb1a105ca91..b1ec18cca1b0e194377d27f77c54df574bb37d43 100644
(file)
--- 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 *memory_limiter::find_individual(int individual) const
{
- ml_memory_record *to_return = N
IL
;
- if (!_individual_sizes->find(individual, to_return)) return N
IL
;
+ ml_memory_record *to_return = N
ULL_POINTER
;
+ if (!_individual_sizes->find(individual, to_return)) return N
ULL_POINTER
;
// no record for that guy.
return to_return;
}
// 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)
{
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;
// check the overall allocation limits first.
if (_overall_limit
&& (_overall_size + memory_desired > _overall_limit) ) return false;