Index: trunk/psLib/src/sysUtils/psMemory.h =================================================================== --- trunk/psLib/src/sysUtils/psMemory.h (revision 1440) +++ trunk/psLib/src/sysUtils/psMemory.h (revision 1441) @@ -1,4 +1,4 @@ #if !defined(PS_MEMORY_H) -# define PS_MEMORY_H +#define PS_MEMORY_H /** @file psMemory.h @@ -15,13 +15,13 @@ * @ingroup MemoryManagement * - * @version $Revision: 1.26 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-09 23:34:58 $ + * @version $Revision: 1.27 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:40:55 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii */ -# include // needed for FILE -# include -# include // we need a mutex to make this stuff thread safe. +#include // needed for FILE +#include +#include // we need a mutex to make this stuff thread safe. /** @addtogroup MemoryManagement @@ -122,13 +122,13 @@ * @see psFree */ -# ifdef DOXYGEN +#ifdef DOXYGEN void *psAlloc(size_t size ///< Size required ); -# else - - void *p_psAlloc(size_t size, ///< Size required - const char *file, ///< File of call - int lineno ///< Line number of call - ); +#else + +void *p_psAlloc(size_t size, ///< Size required + const char *file, ///< File of call + int lineno ///< Line number of call + ); void p_psMemSetDeallocator(void *ptr, psFreeFcn freeFcn); @@ -136,6 +136,6 @@ /// Memory allocation. psAlloc sends file and line number to p_psAlloc. -# define psAlloc(size) p_psAlloc(size, __FILE__, __LINE__) -# endif +#define psAlloc(size) p_psAlloc(size, __FILE__, __LINE__) +#endif /** Memory re-allocation. This operates much like realloc(), but is guaranteed to return a non-NULL value. @@ -144,20 +144,20 @@ * @see psAlloc, psFree */ -# ifdef DOXYGEN +#ifdef DOXYGEN void *psRealloc(void *ptr ///< Pointer to re-allocate size_t size, ///< Size required ); -# else - - void *p_psRealloc(void *ptr, ///< Pointer to re-allocate - size_t size, ///< Size required - const char *file, ///< File of call - int lineno ///< Line number of call - ); +#else + +void *p_psRealloc(void *ptr, ///< Pointer to re-allocate + size_t size, ///< Size required + const char *file, ///< File of call + int lineno ///< Line number of call + ); /// Memory re-allocation. psRealloc sends file and line number to p_psRealloc. -# define psRealloc(ptr, size) p_psRealloc(ptr, size, __FILE__, __LINE__) - -# endif +#define psRealloc(ptr, size) p_psRealloc(ptr, size, __FILE__, __LINE__) + +#endif /** Free memory. This operates much like free(). @@ -165,18 +165,18 @@ * @see psAlloc, psRealloc */ -# ifdef DOXYGEN +#ifdef DOXYGEN void psFree(void *ptr, ///< Pointer to free, if NULL, function returns immediately. ); -# else - - void p_psFree(void *ptr, ///< Pointer to free - const char *file, ///< File of call - int lineno ///< Line number of call - ); +#else + +void p_psFree(void *ptr, ///< Pointer to free + const char *file, ///< File of call + int lineno ///< Line number of call + ); /// Free memory. psFree sends file and line number to p_psFree. -# define psFree(size) p_psFree(size, __FILE__, __LINE__) - -# endif +#define psFree(size) p_psFree(size, __FILE__, __LINE__) + +#endif /** Check for memory leaks. This scans for allocated memory buffers not freed with an ID not less than id0. @@ -218,16 +218,16 @@ * @ingroup memRefCount */ -# ifdef DOXYGEN +#ifdef DOXYGEN void *psMemIncrRefCounter(void *vptr ///< Pointer to increment refCounter, and return ); -# else - - void *p_psMemIncrRefCounter(void *vptr, ///< Pointer to increment refCounter, and return - const char *file, ///< File of call - int lineno ///< Line number of call - ); - -# define psMemIncrRefCounter(vptr) p_psMemIncrRefCounter(vptr, __FILE__, __LINE__) -# endif +#else + +void *p_psMemIncrRefCounter(void *vptr, ///< Pointer to increment refCounter, and return + const char *file, ///< File of call + int lineno ///< Line number of call + ); + +#define psMemIncrRefCounter(vptr) p_psMemIncrRefCounter(vptr, __FILE__, __LINE__) +#endif /** Decrement reference counter and return the pointer @@ -235,16 +235,16 @@ * @ingroup memRefCount */ -# ifdef DOXYGEN +#ifdef DOXYGEN void *psMemDecrRefCounter(void *vptr ///< Pointer to decrement refCounter, and return ); -# else - - void *p_psMemDecrRefCounter(void *vptr, ///< Pointer to decrement refCounter, and return - const char *file, ///< File of call - int lineno ///< Line number of call - ); - -# define psMemDecrRefCounter(vptr) p_psMemDecrRefCounter(vptr, __FILE__, __LINE__) -# endif +#else + +void *p_psMemDecrRefCounter(void *vptr, ///< Pointer to decrement refCounter, and return + const char *file, ///< File of call + int lineno ///< Line number of call + ); + +#define psMemDecrRefCounter(vptr) p_psMemDecrRefCounter(vptr, __FILE__, __LINE__) +#endif /** Set callback for problems @@ -297,22 +297,22 @@ //@} End of Memory Management Functions -# ifndef DOXYGEN +#ifndef DOXYGEN /* * Ensure that any program using malloc/realloc/free will fail to compile */ -# ifndef PS_ALLOW_MALLOC -# ifdef __GNUC__ -# pragma GCC poison malloc realloc calloc free -# else - # define malloc(S) _Pragma("error Use of malloc is not allowed. Use psAlloc instead.") - # define realloc(P,S) _Pragma("error Use of realloc is not allowed. Use psRealloc instead.") - # define calloc(S) _Pragma("error Use of calloc is not allowed. Use psAlloc instead.") - # define free(P) _Pragma("error Use of free is not allowed. Use psFree instead.") - # endif - # endif - - # endif - // doxygen skip - - #endif // end of header file +#ifndef PS_ALLOW_MALLOC +#ifdef __GNUC__ +#pragma GCC poison malloc realloc calloc free +#else +# define malloc(S) _Pragma("error Use of malloc is not allowed. Use psAlloc instead.") +# define realloc(P,S) _Pragma("error Use of realloc is not allowed. Use psRealloc instead.") +# define calloc(S) _Pragma("error Use of calloc is not allowed. Use psAlloc instead.") +# define free(P) _Pragma("error Use of free is not allowed. Use psFree instead.") +# endif +# endif + +# endif +// doxygen skip + +#endif // end of header file