Index: trunk/psLib/src/collections/psArray.h
===================================================================
--- trunk/psLib/src/collections/psArray.h	(revision 4154)
+++ trunk/psLib/src/collections/psArray.h	(revision 4162)
@@ -12,6 +12,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-17 19:26:23 $
+ *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-08 23:40:45 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -48,5 +48,5 @@
 /** Allocate an array.
  *
- * Uses psLib memory allocation functions to create an array collection of 
+ * Uses psLib memory allocation functions to create an array collection of
  * data
  *
@@ -60,6 +60,6 @@
 /** Reallocate an array.
  *
- * Uses psLib memory allocation functions to reallocate an array collection 
- * of data. 
+ * Uses psLib memory allocation functions to reallocate an array collection
+ * of data.
  *
  * @return psArray* : Pointer to psArray.
@@ -85,7 +85,7 @@
 /** Remove an element from the array
  *
- *  Finds and removes the specified data pointer from the list.  
+ *  Finds and removes the specified data pointer from the list.
  *
- * @return bool:  TRUE if the specified data pointer was found and removed, 
+ * @return bool:  TRUE if the specified data pointer was found and removed,
  *                otherwise FALSE.
  *
@@ -98,5 +98,5 @@
 /** Deallocate/Dereference elements of an array.
  *
- * Uses psLib memory allocation functions to deallocate/dereference elements 
+ * Uses psLib memory allocation functions to deallocate/dereference elements
  * of a array of void pointers.  The array psArr is not freed, and its elements
  * will all be set to NULL.
@@ -112,9 +112,9 @@
  *  to specify how the objects on the array should be sorted.
  *
- *  The comparison function must return an integer less than, equal to, or 
- *  greater than zero if the first argument is considered to be respectively 
- *  less than, equal to, or greater than the second. 
+ *  The comparison function must return an integer less than, equal to, or
+ *  greater than zero if the first argument is considered to be respectively
+ *  less than, equal to, or greater than the second.
  *
- *  If two members compare as equal, their order in the sorted array is 
+ *  If two members compare as equal, their order in the sorted array is
  *  undefined.
  *
@@ -148,3 +148,3 @@
 /// @}
 
-#endif
+#endif // #ifndef PS_ARRAY_H
Index: trunk/psLib/src/collections/psBitSet.h
===================================================================
--- trunk/psLib/src/collections/psBitSet.h	(revision 4154)
+++ trunk/psLib/src/collections/psBitSet.h	(revision 4162)
@@ -12,6 +12,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-17 19:26:23 $
+ *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-08 23:40:45 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -75,7 +75,7 @@
 /** Clear a bit.
  *
- *  Clear a bit at a given bit location. The bit is cleared based on a zero 
- *  index with the first bit set in the zero bit slot of the zero element of 
- *  the byte array. 
+ *  Clear a bit at a given bit location. The bit is cleared based on a zero
+ *  index with the first bit set in the zero bit slot of the zero element of
+ *  the byte array.
  *
  *  @return  psBitSet* : Pointer to struct containing psBitSet.
@@ -143,3 +143,3 @@
 /// @}
 
-#endif
+#endif // #ifndef PSBITSET_H
Index: trunk/psLib/src/collections/psCollectionsErrors.h
===================================================================
--- trunk/psLib/src/collections/psCollectionsErrors.h	(revision 4154)
+++ trunk/psLib/src/collections/psCollectionsErrors.h	(revision 4162)
@@ -7,6 +7,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-05-18 21:38:19 $
+ *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-08 23:40:45 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -23,5 +23,5 @@
  *     $2  The error text (rest of the line in psCollectionsErrors.dat)
  *     $n  The order of the source line in psCollecitonsErrors.dat (comments excluded)
- * 
+ *
  * DO NOT EDIT THE LINES BETWEEN //~Start and //~End!  ANY CHANGES WILL BE OVERWRITTEN.
  */
@@ -67,3 +67,3 @@
 //~End
 
-#endif
+#endif // #ifndef PS_COLLECTIONS_ERRORS_H
Index: trunk/psLib/src/collections/psCompare.h
===================================================================
--- trunk/psLib/src/collections/psCompare.h	(revision 4154)
+++ trunk/psLib/src/collections/psCompare.h	(revision 4162)
@@ -6,11 +6,11 @@
  *  @ingroup Compare
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-17 19:26:23 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-08 23:40:45 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
  */
 
-#if !defined(PS_COMPARE_H)
+#ifndef PS_COMPARE_H
 #define PS_COMPARE_H
 
@@ -24,7 +24,7 @@
  *  e.g., for psList of pointers to numeric values.
  *
- *  @return int      an integer less than, equal to, or greater than zero if 
- *                   the first argument is considered to be respectively less 
- *                   than, equal to, or greater than the second. 
+ *  @return int      an integer less than, equal to, or greater than zero if
+ *                   the first argument is considered to be respectively less
+ *                   than, equal to, or greater than the second.
  */
 typedef int (*psComparePtrFcn) (
@@ -35,7 +35,7 @@
 /** A comparison function for sorting.
  *
- *  @return int      an integer less than, equal to, or greater than zero if 
- *                   the first argument is considered to be respectively less 
- *                   than, equal to, or greater than the second. 
+ *  @return int      an integer less than, equal to, or greater than zero if
+ *                   the first argument is considered to be respectively less
+ *                   than, equal to, or greater than the second.
  */
 typedef int (*psCompareFcn) (
@@ -46,7 +46,7 @@
 /** Compare function of psS8 data.  For use with psListSort.
  *
- *  @return int      an integer less than, equal to, or greater than zero if 
- *                   the first argument is considered to be respectively less 
- *                   than, equal to, or greater than the second. 
+ *  @return int      an integer less than, equal to, or greater than zero if
+ *                   the first argument is considered to be respectively less
+ *                   than, equal to, or greater than the second.
  */
 int psCompareS8Ptr(
@@ -57,7 +57,7 @@
 /** Compare function of psS16 data.  For use with psListSort.
  *
- *  @return int      an integer less than, equal to, or greater than zero if 
- *                   the first argument is considered to be respectively less 
- *                   than, equal to, or greater than the second. 
+ *  @return int      an integer less than, equal to, or greater than zero if
+ *                   the first argument is considered to be respectively less
+ *                   than, equal to, or greater than the second.
  */
 int psCompareS16Ptr(
@@ -68,7 +68,7 @@
 /** Compare function of psS32 data.  For use with psListSort.
  *
- *  @return int      an integer less than, equal to, or greater than zero if 
- *                   the first argument is considered to be respectively less 
- *                   than, equal to, or greater than the second. 
+ *  @return int      an integer less than, equal to, or greater than zero if
+ *                   the first argument is considered to be respectively less
+ *                   than, equal to, or greater than the second.
  */
 int psCompareS32Ptr(
@@ -79,7 +79,7 @@
 /** Compare function of psS64 data.  For use with psListSort.
  *
- *  @return int      an integer less than, equal to, or greater than zero if 
- *                   the first argument is considered to be respectively less 
- *                   than, equal to, or greater than the second. 
+ *  @return int      an integer less than, equal to, or greater than zero if
+ *                   the first argument is considered to be respectively less
+ *                   than, equal to, or greater than the second.
  */
 int psCompareS64Ptr(
@@ -90,7 +90,7 @@
 /** Compare function of psU8 data.  For use with psListSort.
  *
- *  @return int      an integer less than, equal to, or greater than zero if 
- *                   the first argument is considered to be respectively less 
- *                   than, equal to, or greater than the second. 
+ *  @return int      an integer less than, equal to, or greater than zero if
+ *                   the first argument is considered to be respectively less
+ *                   than, equal to, or greater than the second.
  */
 int psCompareU8Ptr(
@@ -101,7 +101,7 @@
 /** Compare function of psU16 data.  For use with psListSort.
  *
- *  @return int      an integer less than, equal to, or greater than zero if 
- *                   the first argument is considered to be respectively less 
- *                   than, equal to, or greater than the second. 
+ *  @return int      an integer less than, equal to, or greater than zero if
+ *                   the first argument is considered to be respectively less
+ *                   than, equal to, or greater than the second.
  */
 int psCompareU16Ptr(
@@ -112,7 +112,7 @@
 /** Compare function of psU32 data.  For use with psListSort.
  *
- *  @return int      an integer less than, equal to, or greater than zero if 
- *                   the first argument is considered to be respectively less 
- *                   than, equal to, or greater than the second. 
+ *  @return int      an integer less than, equal to, or greater than zero if
+ *                   the first argument is considered to be respectively less
+ *                   than, equal to, or greater than the second.
  */
 int psCompareU32Ptr(
@@ -123,7 +123,7 @@
 /** Compare function of psU64 data.  For use with psListSort.
  *
- *  @return int      an integer less than, equal to, or greater than zero if 
- *                   the first argument is considered to be respectively less 
- *                   than, equal to, or greater than the second. 
+ *  @return int      an integer less than, equal to, or greater than zero if
+ *                   the first argument is considered to be respectively less
+ *                   than, equal to, or greater than the second.
  */
 int psCompareU64Ptr(
@@ -134,7 +134,7 @@
 /** Compare function of psF32 data.  For use with psListSort.
  *
- *  @return int      an integer less than, equal to, or greater than zero if 
- *                   the first argument is considered to be respectively less 
- *                   than, equal to, or greater than the second. 
+ *  @return int      an integer less than, equal to, or greater than zero if
+ *                   the first argument is considered to be respectively less
+ *                   than, equal to, or greater than the second.
  */
 int psCompareF32Ptr(
@@ -145,7 +145,7 @@
 /** Compare function of psF64 data.  For use with psListSort.
  *
- *  @return int      an integer less than, equal to, or greater than zero if 
- *                   the first argument is considered to be respectively less 
- *                   than, equal to, or greater than the second. 
+ *  @return int      an integer less than, equal to, or greater than zero if
+ *                   the first argument is considered to be respectively less
+ *                   than, equal to, or greater than the second.
  */
 int psCompareF64Ptr(
@@ -156,7 +156,7 @@
 /** Compare function of psS8 data.  For use with psListSort for descending ordering.
  *
- *  @return int      an integer less than, equal to, or greater than zero if 
- *                   the first argument is considered to be respectively greater 
- *                   than, equal to, or less than the second. 
+ *  @return int      an integer less than, equal to, or greater than zero if
+ *                   the first argument is considered to be respectively greater
+ *                   than, equal to, or less than the second.
  */
 int psCompareDescendingS8Ptr(
@@ -167,7 +167,7 @@
 /** Compare function of psS16 data.  For use with psListSort for descending ordering.
  *
- *  @return int      an integer less than, equal to, or greater than zero if 
- *                   the first argument is considered to be respectively greater 
- *                   than, equal to, or less than the second. 
+ *  @return int      an integer less than, equal to, or greater than zero if
+ *                   the first argument is considered to be respectively greater
+ *                   than, equal to, or less than the second.
  */
 int psCompareDescendingS16Ptr(
@@ -178,7 +178,7 @@
 /** Compare function of psS32 data.  For use with psListSort for descending ordering.
  *
- *  @return int      an integer less than, equal to, or greater than zero if 
- *                   the first argument is considered to be respectively greater 
- *                   than, equal to, or less than the second. 
+ *  @return int      an integer less than, equal to, or greater than zero if
+ *                   the first argument is considered to be respectively greater
+ *                   than, equal to, or less than the second.
  */
 int psCompareDescendingS32Ptr(
@@ -189,7 +189,7 @@
 /** Compare function of psS64 data.  For use with psListSort for descending ordering.
  *
- *  @return int      an integer less than, equal to, or greater than zero if 
- *                   the first argument is considered to be respectively greater 
- *                   than, equal to, or less than the second. 
+ *  @return int      an integer less than, equal to, or greater than zero if
+ *                   the first argument is considered to be respectively greater
+ *                   than, equal to, or less than the second.
  */
 int psCompareDescendingS64Ptr(
@@ -200,7 +200,7 @@
 /** Compare function of psU8 data.  For use with psListSort for descending ordering.
  *
- *  @return int      an integer less than, equal to, or greater than zero if 
- *                   the first argument is considered to be respectively greater 
- *                   than, equal to, or less than the second. 
+ *  @return int      an integer less than, equal to, or greater than zero if
+ *                   the first argument is considered to be respectively greater
+ *                   than, equal to, or less than the second.
  */
 int psCompareDescendingU8Ptr(
@@ -211,7 +211,7 @@
 /** Compare function of psU16 data.  For use with psListSort for descending ordering.
  *
- *  @return int      an integer less than, equal to, or greater than zero if 
- *                   the first argument is considered to be respectively greater 
- *                   than, equal to, or less than the second. 
+ *  @return int      an integer less than, equal to, or greater than zero if
+ *                   the first argument is considered to be respectively greater
+ *                   than, equal to, or less than the second.
  */
 int psCompareDescendingU16Ptr(
@@ -222,7 +222,7 @@
 /** Compare function of psU32 data.  For use with psListSort for descending ordering.
  *
- *  @return int      an integer less than, equal to, or greater than zero if 
- *                   the first argument is considered to be respectively greater 
- *                   than, equal to, or lessg than the second. 
+ *  @return int      an integer less than, equal to, or greater than zero if
+ *                   the first argument is considered to be respectively greater
+ *                   than, equal to, or lessg than the second.
  */
 int psCompareDescendingU32Ptr(
@@ -233,7 +233,7 @@
 /** Compare function of psU64 data.  For use with psListSort for descending ordering.
  *
- *  @return int      an integer less than, equal to, or greater than zero if 
- *                   the first argument is considered to be respectively greater 
- *                   than, equal to, or lessg than the second. 
+ *  @return int      an integer less than, equal to, or greater than zero if
+ *                   the first argument is considered to be respectively greater
+ *                   than, equal to, or lessg than the second.
  */
 int psCompareDescendingU64Ptr(
@@ -244,7 +244,7 @@
 /** Compare function of psF32 data.  For use with psListSort for descending ordering.
  *
- *  @return int      an integer less than, equal to, or greater than zero if 
- *                   the first argument is considered to be respectively greater 
- *                   than, equal to, or lessg than the second. 
+ *  @return int      an integer less than, equal to, or greater than zero if
+ *                   the first argument is considered to be respectively greater
+ *                   than, equal to, or lessg than the second.
  */
 int psCompareDescendingF32Ptr(
@@ -255,7 +255,7 @@
 /** Compare function of psF64 data.  For use with psListSort for descending ordering.
  *
- *  @return int      an integer less than, equal to, or greater than zero if 
- *                   the first argument is considered to be respectively greater 
- *                   than, equal to, or lessg than the second. 
+ *  @return int      an integer less than, equal to, or greater than zero if
+ *                   the first argument is considered to be respectively greater
+ *                   than, equal to, or lessg than the second.
  */
 int psCompareDescendingF64Ptr(
@@ -266,7 +266,7 @@
 /** Compare function of psS8 data.
  *
- *  @return int      an integer less than, equal to, or greater than zero if 
- *                   the first argument is considered to be respectively less 
- *                   than, equal to, or greater than the second. 
+ *  @return int      an integer less than, equal to, or greater than zero if
+ *                   the first argument is considered to be respectively less
+ *                   than, equal to, or greater than the second.
  */
 int psCompareS8(
@@ -278,7 +278,7 @@
 /** Compare function of psS16 data.
  *
- *  @return int      an integer less than, equal to, or greater than zero if 
- *                   the first argument is considered to be respectively less 
- *                   than, equal to, or greater than the second. 
+ *  @return int      an integer less than, equal to, or greater than zero if
+ *                   the first argument is considered to be respectively less
+ *                   than, equal to, or greater than the second.
  */
 int psCompareS16(
@@ -290,7 +290,7 @@
 /** Compare function of psS32 data.
  *
- *  @return int      an integer less than, equal to, or greater than zero if 
- *                   the first argument is considered to be respectively less 
- *                   than, equal to, or greater than the second. 
+ *  @return int      an integer less than, equal to, or greater than zero if
+ *                   the first argument is considered to be respectively less
+ *                   than, equal to, or greater than the second.
  */
 int psCompareS32(
@@ -302,7 +302,7 @@
 /** Compare function of psS64 data.
  *
- *  @return int      an integer less than, equal to, or greater than zero if 
- *                   the first argument is considered to be respectively less 
- *                   than, equal to, or greater than the second. 
+ *  @return int      an integer less than, equal to, or greater than zero if
+ *                   the first argument is considered to be respectively less
+ *                   than, equal to, or greater than the second.
  */
 int psCompareS64(
@@ -314,7 +314,7 @@
 /** Compare function of psU8 data.
  *
- *  @return int      an integer less than, equal to, or greater than zero if 
- *                   the first argument is considered to be respectively less 
- *                   than, equal to, or greater than the second. 
+ *  @return int      an integer less than, equal to, or greater than zero if
+ *                   the first argument is considered to be respectively less
+ *                   than, equal to, or greater than the second.
  */
 int psCompareU8(
@@ -326,7 +326,7 @@
 /** Compare function of psU16 data.
  *
- *  @return int      an integer less than, equal to, or greater than zero if 
- *                   the first argument is considered to be respectively less 
- *                   than, equal to, or greater than the second. 
+ *  @return int      an integer less than, equal to, or greater than zero if
+ *                   the first argument is considered to be respectively less
+ *                   than, equal to, or greater than the second.
  */
 int psCompareU16(
@@ -338,7 +338,7 @@
 /** Compare function of psU32 data.
  *
- *  @return int      an integer less than, equal to, or greater than zero if 
- *                   the first argument is considered to be respectively less 
- *                   than, equal to, or greater than the second. 
+ *  @return int      an integer less than, equal to, or greater than zero if
+ *                   the first argument is considered to be respectively less
+ *                   than, equal to, or greater than the second.
  */
 int psCompareU32(
@@ -350,7 +350,7 @@
 /** Compare function of psU64 data.
  *
- *  @return int      an integer less than, equal to, or greater than zero if 
- *                   the first argument is considered to be respectively less 
- *                   than, equal to, or greater than the second. 
+ *  @return int      an integer less than, equal to, or greater than zero if
+ *                   the first argument is considered to be respectively less
+ *                   than, equal to, or greater than the second.
  */
 int psCompareU64(
@@ -362,7 +362,7 @@
 /** Compare function of psF32 data.
  *
- *  @return int      an integer less than, equal to, or greater than zero if 
- *                   the first argument is considered to be respectively less 
- *                   than, equal to, or greater than the second. 
+ *  @return int      an integer less than, equal to, or greater than zero if
+ *                   the first argument is considered to be respectively less
+ *                   than, equal to, or greater than the second.
  */
 int psCompareF32(
@@ -374,7 +374,7 @@
 /** Compare function of psF64 data.
  *
- *  @return int      an integer less than, equal to, or greater than zero if 
- *                   the first argument is considered to be respectively less 
- *                   than, equal to, or greater than the second. 
+ *  @return int      an integer less than, equal to, or greater than zero if
+ *                   the first argument is considered to be respectively less
+ *                   than, equal to, or greater than the second.
  */
 int psCompareF64(
@@ -386,7 +386,7 @@
 /** Compare function of psS8 data.
  *
- *  @return int      an integer less than, equal to, or greater than zero if 
- *                   the first argument is considered to be respectively greater 
- *                   than, equal to, or less than the second. 
+ *  @return int      an integer less than, equal to, or greater than zero if
+ *                   the first argument is considered to be respectively greater
+ *                   than, equal to, or less than the second.
  */
 int psCompareDescendingS8(
@@ -398,7 +398,7 @@
 /** Compare function of psS16 data.
  *
- *  @return int      an integer less than, equal to, or greater than zero if 
- *                   the first argument is considered to be respectively greater 
- *                   than, equal to, or less than the second. 
+ *  @return int      an integer less than, equal to, or greater than zero if
+ *                   the first argument is considered to be respectively greater
+ *                   than, equal to, or less than the second.
  */
 int psCompareDescendingS16(
@@ -410,7 +410,7 @@
 /** Compare function of psS32 data.
  *
- *  @return int      an integer less than, equal to, or greater than zero if 
- *                   the first argument is considered to be respectively greater 
- *                   than, equal to, or less than the second. 
+ *  @return int      an integer less than, equal to, or greater than zero if
+ *                   the first argument is considered to be respectively greater
+ *                   than, equal to, or less than the second.
  */
 int psCompareDescendingS32(
@@ -422,7 +422,7 @@
 /** Compare function of psS64 data.
  *
- *  @return int      an integer less than, equal to, or greater than zero if 
- *                   the first argument is considered to be respectively greater 
- *                   than, equal to, or less than the second. 
+ *  @return int      an integer less than, equal to, or greater than zero if
+ *                   the first argument is considered to be respectively greater
+ *                   than, equal to, or less than the second.
  */
 int psCompareDescendingS64(
@@ -434,7 +434,7 @@
 /** Compare function of psU8 data.
  *
- *  @return int      an integer less than, equal to, or greater than zero if 
- *                   the first argument is considered to be respectively greater 
- *                   than, equal to, or less than the second. 
+ *  @return int      an integer less than, equal to, or greater than zero if
+ *                   the first argument is considered to be respectively greater
+ *                   than, equal to, or less than the second.
  */
 int psCompareDescendingU8(
@@ -446,7 +446,7 @@
 /** Compare function of psU16 data.
  *
- *  @return int      an integer less than, equal to, or greater than zero if 
- *                   the first argument is considered to be respectively greater 
- *                   than, equal to, or less than the second. 
+ *  @return int      an integer less than, equal to, or greater than zero if
+ *                   the first argument is considered to be respectively greater
+ *                   than, equal to, or less than the second.
  */
 int psCompareDescendingU16(
@@ -458,7 +458,7 @@
 /** Compare function of psU32 data.
  *
- *  @return int      an integer less than, equal to, or greater than zero if 
- *                   the first argument is considered to be respectively greater 
- *                   than, equal to, or less than the second. 
+ *  @return int      an integer less than, equal to, or greater than zero if
+ *                   the first argument is considered to be respectively greater
+ *                   than, equal to, or less than the second.
  */
 int psCompareDescendingU32(
@@ -470,7 +470,7 @@
 /** Compare function of psU64 data.
  *
- *  @return int      an integer less than, equal to, or greater than zero if 
- *                   the first argument is considered to be respectively greater 
- *                   than, equal to, or less than the second. 
+ *  @return int      an integer less than, equal to, or greater than zero if
+ *                   the first argument is considered to be respectively greater
+ *                   than, equal to, or less than the second.
  */
 int psCompareDescendingU64(
@@ -482,7 +482,7 @@
 /** Compare function of psF32 data.
  *
- *  @return int      an integer less than, equal to, or greater than zero if 
- *                   the first argument is considered to be respectively greater 
- *                   than, equal to, or less than the second. 
+ *  @return int      an integer less than, equal to, or greater than zero if
+ *                   the first argument is considered to be respectively greater
+ *                   than, equal to, or less than the second.
  */
 int psCompareDescendingF32(
@@ -494,7 +494,7 @@
 /** Compare function of psF64 data.
  *
- *  @return int      an integer less than, equal to, or greater than zero if 
- *                   the first argument is considered to be respectively greater 
- *                   than, equal to, or less than the second. 
+ *  @return int      an integer less than, equal to, or greater than zero if
+ *                   the first argument is considered to be respectively greater
+ *                   than, equal to, or less than the second.
  */
 int psCompareDescendingF64(
@@ -506,3 +506,3 @@
 /// @}
 
-#endif
+#endif  // #ifndef PS_COMPARE_H
Index: trunk/psLib/src/collections/psHash.h
===================================================================
--- trunk/psLib/src/collections/psHash.h	(revision 4154)
+++ trunk/psLib/src/collections/psHash.h	(revision 4162)
@@ -11,10 +11,11 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-07 22:36:48 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-08 23:40:45 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
  */
-#if !defined(PS_HASH_H)
+
+#ifndef PS_HASH_H
 #define PS_HASH_H
 
@@ -83,3 +84,3 @@
 /* \} */// End of DataGroup Functions
 
-#endif
+#endif // #ifndef PS_HASH_H
Index: trunk/psLib/src/collections/psList.h
===================================================================
--- trunk/psLib/src/collections/psList.h	(revision 4154)
+++ trunk/psLib/src/collections/psList.h	(revision 4162)
@@ -1,5 +1,2 @@
-#if !defined(PS_LIST_H)
-#define PS_LIST_H
-
 /** @file psList.h
  *  @brief Support for doubly linked lists
@@ -10,9 +7,12 @@
  *  @ingroup LinkedList
  *
- *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-03-11 23:17:46 $
+ *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-08 23:40:45 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
  */
+
+#ifndef PS_LIST_H
+#define PS_LIST_H
 
 #include <pthread.h>                   // we need a mutex to make this stuff thread safe.
@@ -210,9 +210,9 @@
 /** Sort a list via a comparison function.
  *
- *  The comparison function must return an integer less than, equal to, or 
- *  greater than zero if the first argument is considered to be respectively 
- *  less than, equal to, or greater than the second. 
- *
- *  If two members compare as equal, their order in the sorted array is 
+ *  The comparison function must return an integer less than, equal to, or
+ *  greater than zero if the first argument is considered to be respectively
+ *  less than, equal to, or greater than the second.
+ *
+ *  If two members compare as equal, their order in the sorted array is
  *  undefined.
  *
@@ -226,3 +226,4 @@
 /// @} End of DataGroup Functions
 
-#endif
+#endif // #ifndef PS_LIST_H
+
Index: trunk/psLib/src/collections/psMetadata.h
===================================================================
--- trunk/psLib/src/collections/psMetadata.h	(revision 4154)
+++ trunk/psLib/src/collections/psMetadata.h	(revision 4162)
@@ -11,6 +11,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.46 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-07 19:59:39 $
+*  @version $Revision: 1.47 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-08 23:40:45 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -70,5 +70,5 @@
  *
  *  Enumeration for the modification of the behaviour in psMetadataAddItem.
- * 
+ *
  *  @see psMetadataAddItem
  */
@@ -239,5 +239,5 @@
     va_list list                       ///< Arguments for name formatting and metadata item data.
 );
-#endif
+#endif // #ifndef SWIG
 
 /** Create a metadata collection.
@@ -294,5 +294,5 @@
     va_list list                       ///< Arguments for name formatting and metadata item data.
 );
-#endif
+#endif // #ifndef SWIG
 
 psBool psMetadataAddS32(psMetadata* md, psS32 location, const char* name,
@@ -479,3 +479,3 @@
 /// @}
 
-#endif
+#endif // #ifndef PS_METADATA_H
Index: trunk/psLib/src/collections/psMetadataIO.h
===================================================================
--- trunk/psLib/src/collections/psMetadataIO.h	(revision 4154)
+++ trunk/psLib/src/collections/psMetadataIO.h	(revision 4162)
@@ -10,6 +10,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-05-16 19:43:53 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-08 23:40:45 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -94,3 +94,3 @@
 /// @}
 
-#endif
+#endif // #ifndef PS_METADATAIO_H
Index: trunk/psLib/src/collections/psPixels.h
===================================================================
--- trunk/psLib/src/collections/psPixels.h	(revision 4154)
+++ trunk/psLib/src/collections/psPixels.h	(revision 4162)
@@ -7,6 +7,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-05-19 23:57:36 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-08 23:40:45 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -132,3 +132,3 @@
 );
 
-#endif
+#endif // #ifndef PS_PIXELS_H
Index: trunk/psLib/src/collections/psScalar.h
===================================================================
--- trunk/psLib/src/collections/psScalar.h	(revision 4154)
+++ trunk/psLib/src/collections/psScalar.h	(revision 4162)
@@ -11,6 +11,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-17 19:26:23 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-08 23:40:45 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -82,3 +82,3 @@
 /// @}
 
-#endif
+#endif // #ifndef PS_SCALAR_H
Index: trunk/psLib/src/collections/psVector.h
===================================================================
--- trunk/psLib/src/collections/psVector.h	(revision 4154)
+++ trunk/psLib/src/collections/psVector.h	(revision 4162)
@@ -11,6 +11,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-29 02:25:09 $
+ *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-08 23:40:45 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -176,3 +176,3 @@
 /// @}
 
-#endif
+#endif // #ifndef PS_VECTOR_H