Changeset 3585
- Timestamp:
- Mar 30, 2005, 4:32:20 PM (21 years ago)
- Location:
- trunk/psLib/src
- Files:
-
- 2 edited
-
sys/psMemory.c (modified) (3 diffs)
-
sysUtils/psMemory.c (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/psLib/src/sys/psMemory.c
r3264 r3585 8 8 * @author Robert Lupton, Princeton University 9 9 * 10 * @version $Revision: 1.4 8$ $Name: not supported by cvs2svn $11 * @date $Date: 2005-0 2-17 19:26:24$10 * @version $Revision: 1.49 $ $Name: not supported by cvs2svn $ 11 * @date $Date: 2005-03-31 02:32:20 $ 12 12 * 13 13 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 292 292 293 293 psMemBlock* ptr = NULL; 294 295 size = (size < recycleBinSize[0]) ? recycleBinSize[0] : size; // set the minimum size to allocate 294 296 295 297 // memory is of the size I want to bother recycling? … … 372 374 psPtr p_psRealloc(psPtr vptr, size_t size, const char *file, psS32 lineno) 373 375 { 376 size = (size < recycleBinSize[0]) ? recycleBinSize[0] : size; // set the minimum size to allocate 377 374 378 if (vptr == NULL) { 375 379 return p_psAlloc(size, file, lineno); -
trunk/psLib/src/sysUtils/psMemory.c
r3264 r3585 8 8 * @author Robert Lupton, Princeton University 9 9 * 10 * @version $Revision: 1.4 8$ $Name: not supported by cvs2svn $11 * @date $Date: 2005-0 2-17 19:26:24$10 * @version $Revision: 1.49 $ $Name: not supported by cvs2svn $ 11 * @date $Date: 2005-03-31 02:32:20 $ 12 12 * 13 13 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 292 292 293 293 psMemBlock* ptr = NULL; 294 295 size = (size < recycleBinSize[0]) ? recycleBinSize[0] : size; // set the minimum size to allocate 294 296 295 297 // memory is of the size I want to bother recycling? … … 372 374 psPtr p_psRealloc(psPtr vptr, size_t size, const char *file, psS32 lineno) 373 375 { 376 size = (size < recycleBinSize[0]) ? recycleBinSize[0] : size; // set the minimum size to allocate 377 374 378 if (vptr == NULL) { 375 379 return p_psAlloc(size, file, lineno);
Note:
See TracChangeset
for help on using the changeset viewer.
