Index: trunk/psLib/src/sys/psMemory.h
===================================================================
--- trunk/psLib/src/sys/psMemory.h	(revision 9538)
+++ trunk/psLib/src/sys/psMemory.h	(revision 11248)
@@ -1,19 +1,16 @@
-/** @file  psMemory.h
- *
- *  @brief Contains the definitions for the memory management system
- *
- *  This is the generic memory management system put inbetween the user's high level code and the OS-level
- *  memory allocation routines.  This system adds such features as callback routines for memory error events,
- *  tracing capabilities, and reference counting.
- *
- *  @author Robert DeSonia, MHPCC
- *  @author Robert Lupton, Princeton University
- *
- *  @ingroup MemoryManagement
- *
- *  @version $Revision: 1.61 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-13 21:13:48 $
- *
- *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
+/* @file  psMemory.h
+ *
+ * @brief Contains the definitions for the memory management system
+ *
+ * This is the generic memory management system put inbetween the user's high level code and the OS-level
+ * memory allocation routines.  This system adds such features as callback routines for memory error events,
+ * tracing capabilities, and reference counting.
+ *
+ * @author Robert Lupton, Princeton University
+ * @author Robert DeSonia, MHPCC
+ *
+ * $Revision: 1.62 $ $Name: not supported by cvs2svn $
+ * $Date: 2007-01-23 22:47:23 $
+ * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
  */
 
@@ -21,32 +18,12 @@
 #define PS_MEMORY_H
 
+/// @addtogroup SysUtils System Utilities
+/// @{
+
 #include <stdio.h>                     // needed for FILE
 #include <pthread.h>                   // we need a mutex to make this stuff thread safe.
-
 #include "psType.h"
 
-/** @addtogroup MemoryManagement
- *  @{
- */
-
 #define P_PS_MEMMAGIC (psPtr)0xdeadbeef   // Magic number in psMemBlock header
-
-/**
- *  @addtogroup memCallback Memory Callbacks
- *
- *  Routines dealing with the creating and setting of memory management callback functions.
- */
-
-/**
- *  @addtogroup memTracing Memory Tracing
- *
- *  Routines dealing with memory tracing and corruption checking.
- */
-
-/**
- *  @addtogroup memRefCount Reference Count
- *
- *  Routines dealing with the reference counting of allocated buffers.
- */
 
 /// typedef for memory identification numbers.  Guaranteed to be some variety of integer.
@@ -84,5 +61,4 @@
  *
  *  @see psMemAllocCallbackSet
- *  @ingroup memCallback
  */
 typedef psMemId(*psMemAllocCallback) (
@@ -93,5 +69,4 @@
  *
  *  @see psMemFreeCallbackSet
- *  @ingroup memCallback
  */
 typedef psMemId(*psMemFreeCallback) (
@@ -104,5 +79,4 @@
  *
  *  @see psMemProblemCallbackSet
- *  @ingroup memCallback
  */
 typedef void (*psMemProblemCallback) (
@@ -118,5 +92,4 @@
  *
  *  @see psMemExhaustedCallbackSet
- *  @ingroup memCallback
  */
 typedef psPtr (*psMemExhaustedCallback) (
@@ -303,5 +276,4 @@
  *              blocks above id0 that have not been freed.
  *  @see psAlloc, psFree, psgetMemId, psMemProblemCallbackSet
- *  @ingroup memTracing
  */
 int psMemCheckLeaks(
@@ -317,5 +289,4 @@
  *  @return int
  *
- *  @ingroup memTracing
  */
 int psMemCheckCorruption(
@@ -327,5 +298,4 @@
  *  @return psReferenceCount
  *
- *  @ingroup memRefCount
  */
 psReferenceCount psMemGetRefCounter(
@@ -337,5 +307,4 @@
  *  @return psPtr
  *
- *  @ingroup memRefCount
  */
 #ifdef DOXYGEN
@@ -358,5 +327,4 @@
 /** Decrement reference counter and return the pointer
  *
- *  @ingroup memRefCount
  *
  *  @return psPtr    the pointer deremented in refCount, or NULL if pointer is
@@ -381,6 +349,4 @@
 
 /** Set reference counter and return the pointer
- *
- *  @ingroup memRefCount
  *
  *  @return psPtr    the pointer with refCount set, or NULL if pointer is
@@ -411,6 +377,4 @@
  *  stack. If any of these checks discover that the memory stack is corrupted,
  *  the psMemProblemCallback is called.
- 
- *  @ingroup memCallback
  *
  *  @return psMemProblemCallback       old psMemProblemCallback function
@@ -431,6 +395,4 @@
  *  request and try again, limiting the size of the operating buffer.
  *
- *  @ingroup memCallback
- *
  *  @return psMemExhaustedCallback     old psMemExhaustedCallback function
  */
@@ -446,6 +408,4 @@
  *  just before memory is returned to the calling function.
  *
- *  @ingroup memCallback
- *
  *  @return psMemAllocCallback      old psMemAllocCallback function
  */
@@ -461,6 +421,4 @@
  *  before the memory block is freed.
  *
- *  @ingroup memCallback
- *
  *  @return psMemFreeCallback          old psMemFreeCallback function
  */
@@ -471,6 +429,4 @@
 /** get next memory ID
  *
- *  @ingroup memCallback
- *
  *  @return psMemId                 the next memory ID to be used
  */
@@ -478,6 +434,4 @@
 
 /** get the last memory ID used
- *
- *  @ingroup memCallback
  *
  *  @return psMemId                 the last memory ID used
@@ -492,6 +446,4 @@
  *  just before memory is returned to the calling function.
  *
- *  @ingroup memCallback
- *
  *  @return psMemId
  *
@@ -509,6 +461,4 @@
  *  before the memory block is freed.
  *
- *  @ingroup memCallback
- *
  *  @return psMemId                 the old p_psMemFreeID
  *
@@ -530,5 +480,5 @@
                   size_t *freelist); ///< memory that's waiting to be recycled
 
-//@} End of Memory Management Functions
+/// @} end of SysUtils
 
 #ifndef DOXYGEN
@@ -549,4 +499,3 @@
 
 #endif // #ifndef DOXYGEN
-
 #endif // #ifndef PS_MEMORY_H