Index: trunk/psLib/src/sys/psMemory.h
===================================================================
--- trunk/psLib/src/sys/psMemory.h	(revision 1407)
+++ trunk/psLib/src/sys/psMemory.h	(revision 1426)
@@ -15,6 +15,6 @@
  *  @ingroup MemoryManagement
  *
- *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-08-07 00:06:06 $
+ *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-08-09 22:44:25 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -63,15 +63,15 @@
 typedef struct psMemBlock
 {
-    const void *startblock;     // /< initialised to p_psMEMMAGIC
-    struct psMemBlock *previousBlock;   // /< previous block in allocation list
-    struct psMemBlock *nextBlock;       // /< next block allocation list
-    psFreeFcn freeFcn;          // /< deallocator.  If NULL, use generic deallocation.
-    size_t userMemorySize;      // /< the size of the user-portion of the memory block
-    const psMemoryId id;        // /< a unique ID for this allocation
-    const char *file;           // /< set from __FILE__ in e.g. p_psAlloc
-    const int lineno;           // /< set from __LINE__ in e.g. p_psAlloc
-    pthread_mutex_t refCounterMutex;    // /< mutex to ensure exclusive access to reference counter
-    psReferenceCount refCounter;        // /< how many times pointer is referenced
-    const void *endblock;       // /< initialised to p_psMEMMAGIC
+    const void *startblock;     ///< initialised to p_psMEMMAGIC
+    struct psMemBlock *previousBlock;   ///< previous block in allocation list
+    struct psMemBlock *nextBlock;       ///< next block allocation list
+    psFreeFcn freeFcn;          ///< deallocator.  If NULL, use generic deallocation.
+    size_t userMemorySize;      ///< the size of the user-portion of the memory block
+    const psMemoryId id;        ///< a unique ID for this allocation
+    const char *file;           ///< set from __FILE__ in e.g. p_psAlloc
+    const int lineno;           ///< set from __LINE__ in e.g. p_psAlloc
+    pthread_mutex_t refCounterMutex;    ///< mutex to ensure exclusive access to reference counter
+    psReferenceCount refCounter;        ///< how many times pointer is referenced
+    const void *endblock;       ///< initialised to p_psMEMMAGIC
 }
 psMemBlock;
@@ -82,5 +82,5 @@
  *  @ingroup memCallback
  */
-typedef psMemoryId(*psMemAllocateCallback) (const psMemBlock * ptr      // /< the psMemBlock just allocated
+typedef psMemoryId(*psMemAllocateCallback) (const psMemBlock * ptr      ///< the psMemBlock just allocated
                                            );
 
@@ -90,5 +90,5 @@
  *  @ingroup memCallback
  */
-typedef psMemoryId(*psMemFreeCallback) (const psMemBlock * ptr  // /< the psMemBlock being freed
+typedef psMemoryId(*psMemFreeCallback) (const psMemBlock * ptr  ///< the psMemBlock being freed
                                        );
 
@@ -100,8 +100,8 @@
  *  @ingroup memCallback
  */
-typedef void (*psMemProblemCallback) (const psMemBlock * ptr,   // /< the pointer to the problematic memory
+typedef void (*psMemProblemCallback) (const psMemBlock * ptr,   ///< the pointer to the problematic memory
                                       // block.
-                                      const char *file, // /< the file in which the problem originated
-                                      int lineno        // /< the line number in which the problem originated
+                                      const char *file, ///< the file in which the problem originated
+                                      int lineno        ///< the line number in which the problem originated
                                      );
 
@@ -123,10 +123,11 @@
  */
 #    ifdef DOXYGEN
-void *psAlloc(size_t size       // /< Size required
+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
+
+    void *p_psAlloc(size_t size,    ///< Size required
+                    const char *file,       ///< File of call
+                    int lineno      ///< Line number of call
                    );
 
@@ -144,12 +145,13 @@
  */
 #    ifdef DOXYGEN
-void *psRealloc(void *ptr       // /< Pointer to re-allocate
-                size_t size,    // /< Size required
+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
+
+    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
                      );
 
@@ -164,10 +166,11 @@
  */
 #    ifdef DOXYGEN
-void psFree(void *ptr,          // /< Pointer to free, if NULL, function returns immediately.
+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
+
+    void p_psFree(void *ptr,        ///< Pointer to free
+                  const char *file, ///< File of call
+                  int lineno        ///< Line number of call
                  );
 
@@ -191,7 +194,7 @@
  *  @ingroup memTracing
  */
-int psMemCheckLeaks(psMemoryId id0,     // /< don't list blocks with id < id0
-                    psMemBlock *** arr, // /< pointer to array of pointers to leaked blocks, or NULL
-                    FILE * fd   // /< print list of leaks to fd (or NULL)
+int psMemCheckLeaks(psMemoryId id0,     ///< don't list blocks with id < id0
+                    psMemBlock *** arr, ///< pointer to array of pointers to leaked blocks, or NULL
+                    FILE * fd   ///< print list of leaks to fd (or NULL)
                    );
 
@@ -201,5 +204,5 @@
  *  @ingroup memTracing
  */
-int psMemCheckCorruption(bool abort_on_error    // /< Abort on detecting corruption?
+int psMemCheckCorruption(bool abort_on_error    ///< Abort on detecting corruption?
                         );
 
@@ -208,5 +211,5 @@
  *  @ingroup memRefCount
  */
-psReferenceCount psMemGetRefCounter(void *vptr  // /< Pointer to get refCounter for
+psReferenceCount psMemGetRefCounter(void *vptr  ///< Pointer to get refCounter for
                                    );
 
@@ -216,10 +219,11 @@
  */
 #    ifdef DOXYGEN
-void *psMemIncrRefCounter(void *vptr    // /< Pointer to increment refCounter, and return
+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
+
+    void *p_psMemIncrRefCounter(void *vptr, ///< Pointer to increment refCounter, and return
+                                const char *file,   ///< File of call
+                                int lineno  ///< Line number of call
                                );
 
@@ -232,10 +236,11 @@
  */
 #    ifdef DOXYGEN
-void *psMemDecrRefCounter(void *vptr    // /< Pointer to decrement refCounter, and return
+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
+
+    void *p_psMemDecrRefCounter(void *vptr, ///< Pointer to decrement refCounter, and return
+                                const char *file,   ///< File of call
+                                int lineno  ///< Line number of call
                                );
 
@@ -246,5 +251,5 @@
  *  @ingroup memCallback
  */
-psMemProblemCallback psMemProblemCallbackSet(psMemProblemCallback func  // /< Function to run
+psMemProblemCallback psMemProblemCallbackSet(psMemProblemCallback func  ///< Function to run
                                             );
 
@@ -253,5 +258,5 @@
  *  @ingroup memCallback
  */
-psMemExhaustedCallback psMemExhaustedCallbackSet(psMemExhaustedCallback func    // /< Function to run
+psMemExhaustedCallback psMemExhaustedCallbackSet(psMemExhaustedCallback func    ///< Function to run
                                                 );
 
@@ -260,5 +265,5 @@
  *  @ingroup memCallback
  */
-psMemAllocateCallback psMemAllocateCallbackSet(psMemAllocateCallback func       // /< Function to run
+psMemAllocateCallback psMemAllocateCallbackSet(psMemAllocateCallback func       ///< Function to run
                                               );
 
@@ -267,5 +272,5 @@
  *  @ingroup memCallback
  */
-psMemFreeCallback psMemFreeCallbackSet(psMemFreeCallback func   // /< Function to run
+psMemFreeCallback psMemFreeCallbackSet(psMemFreeCallback func   ///< Function to run
                                       );
 
@@ -280,5 +285,5 @@
  *  @ingroup memCallback
  */
-psMemoryId psMemAllocateCallbackSetID(psMemoryId id     // /< ID to set
+psMemoryId psMemAllocateCallbackSetID(psMemoryId id     ///< ID to set
                                      );
 
@@ -287,5 +292,5 @@
  *  @ingroup memCallback
  */
-psMemoryId psMemFreeCallbackSetID(psMemoryId id // /< ID to set
+psMemoryId psMemFreeCallbackSetID(psMemoryId id ///< ID to set
                                  );