Index: trunk/psLib/src/astro/psCoord.c
===================================================================
--- trunk/psLib/src/astro/psCoord.c	(revision 11667)
+++ trunk/psLib/src/astro/psCoord.c	(revision 11668)
@@ -10,6 +10,6 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.132 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2007-02-03 06:01:42 $
+*  @version $Revision: 1.133 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2007-02-06 21:36:09 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -151,5 +151,5 @@
 Why isn't this called p_psIsPlaneTransformLinear()?
  *****************************************************************************/
-psBool p_psIsProjectionLinear(psPlaneTransform *transform)
+bool p_psIsProjectionLinear(psPlaneTransform *transform)
 {
     PS_ASSERT_PTR_NON_NULL(transform, false);
Index: trunk/psLib/src/astro/psCoord.h
===================================================================
--- trunk/psLib/src/astro/psCoord.h	(revision 11667)
+++ trunk/psLib/src/astro/psCoord.h	(revision 11668)
@@ -8,6 +8,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.56 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-23 22:47:22 $
+ *  @version $Revision: 1.57 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-06 21:36:09 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -321,5 +321,5 @@
  *  the order of the projection
 */
-psBool p_psIsProjectionLinear(
+bool p_psIsProjectionLinear(
     psPlaneTransform *transform        ///< transform to test for linearity
 );
Index: trunk/psLib/src/astro/psTime.c
===================================================================
--- trunk/psLib/src/astro/psTime.c	(revision 11667)
+++ trunk/psLib/src/astro/psTime.c	(revision 11668)
@@ -10,6 +10,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.108 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-09 22:38:52 $
+ *  @version $Revision: 1.109 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-06 21:36:09 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1268,5 +1268,5 @@
 {
     psTime*    prevUtc     = NULL;
-    psBool     returnValue = false;
+    bool     returnValue = false;
 
     // Check for valid time
Index: trunk/psLib/src/astro/psTime.h
===================================================================
--- trunk/psLib/src/astro/psTime.h	(revision 11667)
+++ trunk/psLib/src/astro/psTime.h	(revision 11668)
@@ -11,6 +11,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.54 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-23 22:47:22 $
+ *  @version $Revision: 1.55 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-06 21:36:09 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -85,5 +85,5 @@
  * @return bool:    True for success, false for failure.
  */
-psBool p_psTimeInit(
+bool p_psTimeInit(
     const char *fileName               ///< File name containing config/data info
 );
@@ -103,5 +103,5 @@
  * @return void:    void.
  */
-psBool p_psTimeFinalize(void);
+bool p_psTimeFinalize(void);
 
 /** Frees memory that was allocated by psTime functions.
Index: trunk/psLib/src/db/psDB.c
===================================================================
--- trunk/psLib/src/db/psDB.c	(revision 11667)
+++ trunk/psLib/src/db/psDB.c	(revision 11668)
@@ -12,6 +12,6 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.133 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-30 05:16:28 $
+ *  @version $Revision: 1.134 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-06 21:36:09 $
  *
  *  Copyright (C) 2005-2006  Joshua Hoblitt, University of Hawaii
@@ -1337,5 +1337,5 @@
         case PS_DATA_BOOL: {
                 // XXX: ASC HACK NOTE (2005/06/03): set extreme bytes to the
-                // boolean character value.  sizeof(psBool)==4 which triggers
+                // boolean character value.  sizeof(bool)==4 which triggers
                 // an endianess issue in the MySQL conversion (reading only 1
                 // byte), on Macintosh hardware (and maybe others?)
@@ -2013,5 +2013,5 @@
             break;
         default:
-            psError(PS_ERR_UNKNOWN, true, "NULL psBool can't be compared with any operator other than '=='");
+            psError(PS_ERR_UNKNOWN, true, "NULL bool can't be compared with any operator other than '=='");
             psFree(itemName);
             return NULL;
Index: trunk/psLib/src/fft/psImageFFT.c
===================================================================
--- trunk/psLib/src/fft/psImageFFT.c	(revision 11667)
+++ trunk/psLib/src/fft/psImageFFT.c	(revision 11668)
@@ -5,6 +5,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-09 22:38:52 $
+ *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-06 21:36:09 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -30,5 +30,5 @@
 #define PS_FFTW_PLAN_RIGOR FFTW_ESTIMATE
 
-static psBool p_fftwWisdomImported = false;
+static bool p_fftwWisdomImported = false;
 
 psImage* psImageFFT(psImage* out, const psImage* image, psFFTFlags direction)
Index: trunk/psLib/src/fft/psVectorFFT.c
===================================================================
--- trunk/psLib/src/fft/psVectorFFT.c	(revision 11667)
+++ trunk/psLib/src/fft/psVectorFFT.c	(revision 11668)
@@ -5,6 +5,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-09 22:38:52 $
+ *  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-06 21:36:09 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -30,5 +30,5 @@
 #define P_FFTW_PLAN_RIGOR FFTW_ESTIMATE
 
-static psBool p_fftwWisdomImported = false;
+static bool p_fftwWisdomImported = false;
 
 psVector* psVectorFFT(psVector* out, const psVector* in, psFFTFlags direction)
Index: trunk/psLib/src/fits/psFitsHeader.c
===================================================================
--- trunk/psLib/src/fits/psFitsHeader.c	(revision 11667)
+++ trunk/psLib/src/fits/psFitsHeader.c	(revision 11668)
@@ -7,6 +7,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-09 22:38:52 $
+ *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-06 21:36:09 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -103,5 +103,5 @@
         }
 
-        psBool success;                 // Was the add to the metadata successful?
+        bool success;                 // Was the add to the metadata successful?
         switch (keyType) {
         case 'X': // bit
Index: trunk/psLib/src/math/psMinimizeLMM.c
===================================================================
--- trunk/psLib/src/math/psMinimizeLMM.c	(revision 11667)
+++ trunk/psLib/src/math/psMinimizeLMM.c	(revision 11668)
@@ -10,6 +10,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-09 22:38:53 $
+ *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-06 21:36:09 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -54,5 +54,5 @@
 /*****************************************************************************/
 
-psBool p_psMinLM_GuessABP(
+bool p_psMinLM_GuessABP(
     psImage  *Alpha,
     psVector *Beta,
@@ -171,5 +171,5 @@
     psVector *Params = psVectorAlloc(params->n, PS_TYPE_F32);
     psVector *dy     = NULL;
-    psBool rc = true;
+    bool rc = true;
 
     // the user provides the error or NULL.  we need to convert
@@ -196,5 +196,5 @@
     }
 
-    psBool rcBool = p_psMinLM_GuessABP(Alpha, delta, Params, alpha, beta, params, paramMask, NULL, 0.0);
+    bool rcBool = p_psMinLM_GuessABP(Alpha, delta, Params, alpha, beta, params, paramMask, NULL, 0.0);
     if (rcBool == false) {
         psTrace ("psLib.math", 5, "p_psMinLM_GuessABP() returned FALSE.\n");
@@ -334,5 +334,5 @@
 XXX Make an F64 version?
   *****************************************************************************/
-psBool psMinimizeLMChi2(
+bool psMinimizeLMChi2(
     psMinimization *min,
     psImage *covar,
Index: trunk/psLib/src/math/psMinimizeLMM.h
===================================================================
--- trunk/psLib/src/math/psMinimizeLMM.h	(revision 11667)
+++ trunk/psLib/src/math/psMinimizeLMM.h	(revision 11668)
@@ -7,6 +7,6 @@
  * @author GLG, MHPCC
  *
- * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-01-23 22:47:23 $
+ * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-02-06 21:36:09 $
  * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
  */
@@ -156,5 +156,5 @@
 
 
-psBool p_psMinLM_GuessABP(
+bool p_psMinLM_GuessABP(
     psImage  *Alpha,
     psVector *Beta,
Index: trunk/psLib/src/math/psMinimizePowell.c
===================================================================
--- trunk/psLib/src/math/psMinimizePowell.c	(revision 11667)
+++ trunk/psLib/src/math/psMinimizePowell.c	(revision 11668)
@@ -11,6 +11,6 @@
  *  NOTE: XXX: The SDR is silent about data types.  F32 is implemented here.
  *
- *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-09 22:38:53 $
+ *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-06 21:36:09 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -120,5 +120,5 @@
     psF32 stepSize = PS_DETERMINE_BRACKET_STEP_SIZE;
     psVector *tmp = NULL;
-    psBool boolLineIsNull = true;
+    bool boolLineIsNull = true;
 
     psTrace("psLib.math", 4, "---- p_psDetermineBracket() begin ----\n");
@@ -254,5 +254,5 @@
     psS32 iter = 0;
     psVector *tmp = psVectorAlloc(params->n, PS_TYPE_F32);
-    psBool boolLineIsNull = true;
+    bool boolLineIsNull = true;
     psF32 prevMin = 0.0;
     psS32 countMin = 0;
Index: trunk/psLib/src/mathtypes/psImage.c
===================================================================
--- trunk/psLib/src/mathtypes/psImage.c	(revision 11667)
+++ trunk/psLib/src/mathtypes/psImage.c	(revision 11668)
@@ -9,6 +9,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.121 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-09 22:38:53 $
+ *  @version $Revision: 1.122 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-06 21:36:09 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -780,8 +780,8 @@
     ps##TYPE V10 = 0; \
     ps##TYPE V11 = 0; \
-    psBool valid00 = false; \
-    psBool valid01 = false; \
-    psBool valid10 = false; \
-    psBool valid11 = false; \
+    bool valid00 = false; \
+    bool valid01 = false; \
+    bool valid10 = false; \
+    bool valid11 = false; \
     \
     if (floorY >= 0 && floorY <= lastY) { \
@@ -821,5 +821,5 @@
     \
     RETURNTYPE V0 = 0.0; \
-    psBool valid0 = true; \
+    bool valid0 = true; \
     if (valid00 && valid10) { \
         V0 = V00*FRACFUNC(1-fracX)+V10*FRACFUNC(fracX); \
@@ -833,5 +833,5 @@
     \
     RETURNTYPE V1 = 0.0; \
-    psBool valid1 = true; \
+    bool valid1 = true; \
     if (valid01 && valid11) { \
         V1 = V01*FRACFUNC(1-fracX)+V11*FRACFUNC(fracX); \
Index: trunk/psLib/src/mathtypes/psVector.c
===================================================================
--- trunk/psLib/src/mathtypes/psVector.c	(revision 11667)
+++ trunk/psLib/src/mathtypes/psVector.c	(revision 11668)
@@ -9,6 +9,6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.90 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2007-01-09 22:38:53 $
+*  @version $Revision: 1.91 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2007-02-06 21:36:09 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -693,7 +693,7 @@
             // This is a little ugly, because psVector doesn't have a boolean type yet.
             int temp = va_arg(argp, int);
-            psBool value = temp;
+            bool value = temp;
             if (!value) {
-                memset(vector->data.U8, 0, vector->n * sizeof(psBool));
+                memset(vector->data.U8, 0, vector->n * sizeof(bool));
             } else {
                 for (long i = 0; i < vector->n; i++) {
Index: trunk/psLib/src/mathtypes/psVector.h
===================================================================
--- trunk/psLib/src/mathtypes/psVector.h	(revision 11667)
+++ trunk/psLib/src/mathtypes/psVector.h	(revision 11668)
@@ -9,6 +9,6 @@
  * @author Ross Harman, MHPCC
  *
- * @version $Revision: 1.61 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-01-23 22:47:23 $
+ * @version $Revision: 1.62 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-02-06 21:36:09 $
  * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
  */
@@ -199,5 +199,5 @@
 /** Print a vector to a stream
  *
- *  @return psBool          TRUE is successful, otherwise FALSE.
+ *  @return bool          TRUE is successful, otherwise FALSE.
  */
 bool p_psVectorPrint (
Index: trunk/psLib/src/sys/psError.h
===================================================================
--- trunk/psLib/src/sys/psError.h	(revision 11667)
+++ trunk/psLib/src/sys/psError.h	(revision 11668)
@@ -11,6 +11,6 @@
  *  @author Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-23 22:47:23 $
+ *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-06 21:36:09 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -134,5 +134,5 @@
 psErrorCode psError(
     psErrorCode code,                  ///< Error class code
-    psBool new,                        ///< true if error originates at this location
+    bool new,                        ///< true if error originates at this location
     const char* format,                ///< printf-style format of header line
     ...                                ///< any parameters required in format
Index: trunk/psLib/src/sys/psErrorCodes.c.in
===================================================================
--- trunk/psLib/src/sys/psErrorCodes.c.in	(revision 11667)
+++ trunk/psLib/src/sys/psErrorCodes.c.in	(revision 11668)
@@ -7,6 +7,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-24 22:14:48 $
+ *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-06 21:36:09 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -145,5 +145,5 @@
 }
 
-psBool p_psErrorUnregister(psErrorCode code)
+bool p_psErrorUnregister(psErrorCode code)
 {
     // Check input argument is non-negative
Index: trunk/psLib/src/sys/psErrorCodes.h.in
===================================================================
--- trunk/psLib/src/sys/psErrorCodes.h.in	(revision 11667)
+++ trunk/psLib/src/sys/psErrorCodes.h.in	(revision 11668)
@@ -6,6 +6,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-23 22:47:23 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-06 21:36:09 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -75,7 +75,7 @@
 /** Clears error codes registered via psErrorRegister.
  *
- *  @return psBool    TRUE if given errorcode was removed, otherwise FALSE.
+ *  @return bool    TRUE if given errorcode was removed, otherwise FALSE.
  */
-psBool p_psErrorUnregister(
+bool p_psErrorUnregister(
     psErrorCode code                   ///< the error code to find and remove
 );
Index: trunk/psLib/src/sys/psLogMsg.c
===================================================================
--- trunk/psLib/src/sys/psLogMsg.c	(revision 11667)
+++ trunk/psLib/src/sys/psLogMsg.c	(revision 11668)
@@ -11,6 +11,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.65 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-02-03 05:54:08 $
+ *  @version $Revision: 1.66 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-06 21:36:09 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -47,9 +47,9 @@
 static int logFD = STDERR_FILENO;       // Log file descriptor
 static psS32 globalLogLevel = PS_LOG_INFO; // log all messages at this or above
-static psBool logTime = true;     // Flag to include time info
-static psBool logHost = true;     // Flag to include host info
-static psBool logLevel = true;    // Flag to include level info
-static psBool logName = true;     // Flag to include name info
-static psBool logMsg = true;      // Flag to include message info
+static bool logTime = true;     // Flag to include time info
+static bool logHost = true;     // Flag to include host info
+static bool logLevel = true;    // Flag to include level info
+static bool logName = true;     // Flag to include name info
+static bool logMsg = true;      // Flag to include message info
 
 /*****************************************************************************
@@ -86,5 +86,5 @@
  dest (psS32): the new log destination
 Return:
- An psBool: TRUE if successful.
+ An bool: TRUE if successful.
  *****************************************************************************/
 bool psLogSetDestination(int fd)
Index: trunk/psLib/src/sys/psTrace.c
===================================================================
--- trunk/psLib/src/sys/psTrace.c	(revision 11667)
+++ trunk/psLib/src/sys/psTrace.c	(revision 11668)
@@ -9,6 +9,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.83 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-02-03 05:54:08 $
+ *  @version $Revision: 1.84 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-06 21:36:09 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -67,9 +67,9 @@
 
 static p_psComponent* cRoot = NULL; // The root of the trace component
-static psBool traceTime = false;     // Flag to include time info
-static psBool traceHost = false;     // Flag to include host info
-static psBool traceLevel = false;    // Flag to include level info
-static psBool traceName = false;     // Flag to include name info
-static psBool traceMsg = true;      // Flag to include message info
+static bool traceTime = false;     // Flag to include time info
+static bool traceHost = false;     // Flag to include host info
+static bool traceLevel = false;    // Flag to include level info
+static bool traceName = false;     // Flag to include name info
+static bool traceMsg = true;      // Flag to include message info
 static int traceFD = STDOUT_FILENO; // default value
 
@@ -182,5 +182,5 @@
 componentAdd(): Adds the component named "addNodeName" to the root tree.
  *****************************************************************************/
-static psBool componentAdd(const char *addNodeName, psS32 level)
+static bool componentAdd(const char *addNodeName, psS32 level)
 {
     assert(addNodeName);
Index: trunk/psLib/src/sys/psType.h
===================================================================
--- trunk/psLib/src/sys/psType.h	(revision 11667)
+++ trunk/psLib/src/sys/psType.h	(revision 11668)
@@ -10,6 +10,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.54 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2007-01-24 22:14:48 $
+*  @version $Revision: 1.55 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2007-02-06 21:36:09 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -73,5 +73,12 @@
 typedef char* psString;                ///< string value
 typedef void* psPtr;                   ///< void pointer
+// XXX psBool can't be removed until all macros that 'generate' this type are
+// fixed -JH
+// #ifdef __GNUC__
+// typedef bool psBool __attribute__ ((deprecated)); ///< boolean value
+//#else // ifdef __GNUC__
 typedef bool psBool;                   ///< boolean value
+// #endif // fdef __GNUC__
+typedef bool psBOOL;                 ///< allow psBOOL to be used instead of psBool (for macros)
 
 /** Enumeration of data types for function elements.
@@ -150,5 +157,4 @@
 
 typedef psU8 psMaskType;               ///< the C datatype for a mask image
-typedef psBool psBOOL;                 ///< allow psBOOL to be used instead of psBool (for macros)
 
 #define PS_MIN_S8        INT8_MIN      /**< minimum valid psS8 value */
Index: trunk/psLib/src/types/psArray.h
===================================================================
--- trunk/psLib/src/types/psArray.h	(revision 11667)
+++ trunk/psLib/src/types/psArray.h	(revision 11668)
@@ -9,6 +9,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.45 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-23 22:47:23 $
+ *  @version $Revision: 1.46 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-06 21:36:09 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -166,5 +166,5 @@
  *  element is freed.
  *
- *  @return psBool  TRUE if the element was set successfully, otherwise FALSE
+ *  @return bool  TRUE if the element was set successfully, otherwise FALSE
  */
 bool psArraySet(
Index: trunk/psLib/src/types/psHash.c
===================================================================
--- trunk/psLib/src/types/psHash.c	(revision 11667)
+++ trunk/psLib/src/types/psHash.c	(revision 11668)
@@ -12,6 +12,6 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2007-01-09 22:38:53 $
+*  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2007-02-06 21:36:09 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -38,5 +38,5 @@
 static psHashBucket* hashBucketAlloc(const char *key, psPtr data, psHashBucket* next);
 static void hashBucketFree(psHashBucket* bucket);
-static psPtr doHashWork(psHash* table, const char *key, psPtr data, psBool remove
+static psPtr doHashWork(psHash* table, const char *key, psPtr data, bool remove
                            );
 static void hashFree(psHash* table);
@@ -227,5 +227,5 @@
                         const char *key,
                         psPtr data,
-                        psBool remove
+                        bool remove
                            )
 {
@@ -407,5 +407,5 @@
 
     psPtr data = NULL;
-    psBool retVal = false;
+    bool retVal = false;
 
     data = doHashWork(hash, key, NULL, true);
Index: trunk/psLib/src/types/psList.c
===================================================================
--- trunk/psLib/src/types/psList.c	(revision 11667)
+++ trunk/psLib/src/types/psList.c	(revision 11668)
@@ -6,6 +6,6 @@
  *  @author Robert Daniel DeSonia, MHPCC
  *
- *  @version $Revision: 1.59 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-09 22:38:53 $
+ *  @version $Revision: 1.60 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-06 21:36:09 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -35,5 +35,5 @@
 static void listFree(psList* list);
 static void listIteratorFree(psListIterator* iter);
-static psBool listIteratorRemove(psListIterator* iterator);
+static bool listIteratorRemove(psListIterator* iterator);
 
 static void listFree(psList* list)
@@ -80,5 +80,5 @@
 }
 
-static psBool listIteratorRemove(psListIterator* iterator)
+static bool listIteratorRemove(psListIterator* iterator)
 {
     if (iterator == NULL || iterator->cursor == NULL) {
Index: trunk/psLib/src/types/psLookupTable.c
===================================================================
--- trunk/psLib/src/types/psLookupTable.c	(revision 11667)
+++ trunk/psLib/src/types/psLookupTable.c	(revision 11668)
@@ -7,6 +7,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.45 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2007-01-09 22:38:53 $
+*  @version $Revision: 1.46 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2007-02-06 21:36:09 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii
@@ -613,5 +613,5 @@
 {
     psLookupTable* outputTable = NULL;
-    psBool         sortNeeded  = false;
+    bool         sortNeeded  = false;
     psF64          validTo     = 0;
     psF64          validFrom   = 0;
Index: trunk/psLib/src/types/psMetadata.c
===================================================================
--- trunk/psLib/src/types/psMetadata.c	(revision 11667)
+++ trunk/psLib/src/types/psMetadata.c	(revision 11668)
@@ -12,6 +12,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.148 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-09 22:38:53 $
+ *  @version $Revision: 1.149 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-06 21:36:09 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -185,5 +185,5 @@
 METADATAITEM_ALLOC_TYPE(U32,psU32,PS_DATA_U32)
 METADATAITEM_ALLOC_TYPE(U64,psU64,PS_DATA_U64)
-METADATAITEM_ALLOC_TYPE(Bool,psBool,PS_DATA_BOOL)
+METADATAITEM_ALLOC_TYPE(Bool,bool,PS_DATA_BOOL)
 
 psMetadataItem* psMetadataItemAllocPtr(const char *name,
@@ -233,5 +233,5 @@
     switch(metadataItem->type) {
     case PS_DATA_BOOL:
-        metadataItem->data.B = (psBool)va_arg(argPtr, psS32);
+        metadataItem->data.B = (bool)va_arg(argPtr, psS32);
         break;
     case PS_DATA_S8:
@@ -647,5 +647,5 @@
 
     va_start(argPtr, comment);
-    psBool result = psMetadataAddV(md,location,name,format,comment,argPtr);
+    bool result = psMetadataAddV(md,location,name,format,comment,argPtr);
     va_end(argPtr);
 
@@ -683,5 +683,5 @@
 }
 
-METADATA_ADD_TYPE(Bool,psBool,PS_DATA_BOOL)
+METADATA_ADD_TYPE(Bool,bool,PS_DATA_BOOL)
 METADATA_ADD_TYPE(S8,psS8,PS_DATA_S8)
 METADATA_ADD_TYPE(S16,psS16,PS_DATA_S16)
Index: trunk/psLib/src/types/psMetadata.h
===================================================================
--- trunk/psLib/src/types/psMetadata.h	(revision 11667)
+++ trunk/psLib/src/types/psMetadata.h	(revision 11668)
@@ -9,6 +9,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.94 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2007-01-23 22:47:23 $
+*  @version $Revision: 1.95 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2007-02-06 21:36:09 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -104,5 +104,5 @@
     psDataType type;                   ///< Type of metadata item.
     union {
-        psBool B;                      ///< boolean data
+        bool B;                      ///< boolean data
         psS8 S8;                       ///< Signed 8-bit integer data.
         psS16 S16;                     ///< Signed 16-bit integer data.
@@ -301,5 +301,5 @@
 );
 
-/** Create a metadata item with specified psBool data.
+/** Create a metadata item with specified bool data.
  *
  *  Returns a fill psMetadataItem ready for insertion into the psMetadata
@@ -452,5 +452,5 @@
 #endif // #ifndef SWIG
 
-/** Add a psBool value to metadata collection.
+/** Add a bool value to metadata collection.
  *
  *  @return bool:  True for success, False for failure.
Index: trunk/psLib/src/types/psMetadataConfig.c
===================================================================
--- trunk/psLib/src/types/psMetadataConfig.c	(revision 11667)
+++ trunk/psLib/src/types/psMetadataConfig.c	(revision 11668)
@@ -10,6 +10,6 @@
 *  @author Eric Van Alst, MHPCC
 *
-*  @version $Revision: 1.127 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2007-01-19 04:29:11 $
+*  @version $Revision: 1.128 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2007-02-06 21:36:09 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -67,8 +67,8 @@
 static psMetadata* setMetadataItem(psMetadata* template, char* linePtr)
 ;
-static psBool parseLine(psArray* levelArray, char*  linePtr,
-                        psS32 lineCount, psBool overwrite);
-static psBool parseMetadataItem(char* keyName, psArray* levelArray,
-                                char* linePtr, psS32 lineCount, psMetadataFlags flags);
+static bool parseLine(psArray* levelArray, char*  linePtr,
+                      psS32 lineCount, bool overwrite);
+static bool parseMetadataItem(char* keyName, psArray* levelArray,
+                              char* linePtr, psS32 lineCount, psMetadataFlags flags);
 static psString formatMetadataItem(psMetadataItem *item);
 static psArray *p_psMetadataKeyArray(psMetadata *md);
@@ -125,5 +125,5 @@
 // Determines if a line is blank (whitespace only) or a commentline. It returns true if so. The input string
 // must be null terminated.
-static psBool ignoreLine(char *inString)
+static bool ignoreLine(char *inString)
 {
     while(*inString!='\0' && *inString!='#') {
@@ -142,5 +142,5 @@
 static char *cleanString(char *inString,
                          psS32 sLen,
-                         psBool ignoreComment)
+                         bool ignoreComment)
 {
     char *ptrB = NULL;
@@ -208,5 +208,5 @@
                       char *delimiter,
                       psS32 *status,
-                      psBool ignoreComment)
+                      bool ignoreComment)
 {
     char *cleanToken = NULL;
@@ -295,6 +295,6 @@
 
 /** Returns true or false. 'T', 't', '1', 'F', 'f', and '0' are acceptable, parsable variations. */
-static psBool parseBool(char *inString,
-                        psS32 *status)
+static bool parseBool(char *inString,
+                      psS32 *status)
 {
     // if inString is NULL return flalse, status = 0
@@ -446,5 +446,5 @@
 {
     psDataType type;
-    psBool success = true;
+    bool success = true;
 
     PS_ASSERT_PTR_NON_NULL(fd, false);
@@ -669,12 +669,12 @@
 }
 
-psBool parseMetadataItem(char* keyName,
-                         psArray* levelArray,
-                         char* linePtr,
-                         psS32 lineCount,
-                         psMetadataFlags flags)
-{
-    psBool               returnValue   = true;
-    psBool               addStatus     = false;
+bool parseMetadataItem(char* keyName,
+                       psArray* levelArray,
+                       char* linePtr,
+                       psS32 lineCount,
+                       psMetadataFlags flags)
+{
+    bool               returnValue   = true;
+    bool               addStatus     = false;
     psDataType           mdType        = PS_DATA_UNKNOWN;
     psElemType           vectorType    = PS_TYPE_S8;
@@ -685,5 +685,5 @@
     psMetadata*          md            = NULL;
     psF64                tempDbl       = 0.0;
-    psBool               tempBool      = false;
+    bool               tempBool      = false;
     psS64                tempInt       = 0;
     psU64                tempUint      = 0;
@@ -691,5 +691,5 @@
     char*                tempStr       = NULL;
     psArray*             nonUniqueKeys = NULL;
-    psBool               typeFound     = false;
+    bool               typeFound     = false;
     psArray*             typeArray     = NULL;
     psArray*             templateArray = NULL;
@@ -1083,8 +1083,8 @@
 }
 
-psBool parseLine(psArray* levelArray,
-                 char* linePtr,
-                 psS32 lineCount,
-                 psBool overwrite)
+bool parseLine(psArray* levelArray,
+               char* linePtr,
+               psS32 lineCount,
+               bool overwrite)
 {
     psMetadataFlags     flags  = PS_META_DEFAULT;
Index: trunk/psLib/src/types/psMetadataItemCompare.c
===================================================================
--- trunk/psLib/src/types/psMetadataItemCompare.c	(revision 11667)
+++ trunk/psLib/src/types/psMetadataItemCompare.c	(revision 11668)
@@ -57,5 +57,5 @@
 
     switch (template->type) {
-        TEMPLATE_CASE(BOOL, B,   psBool)
+        TEMPLATE_CASE(BOOL, B,   bool)
         ;
         TEMPLATE_CASE(U8,   U8,  psU8 );
Index: trunk/psLib/src/types/psMetadataItemParse.c
===================================================================
--- trunk/psLib/src/types/psMetadataItemParse.c	(revision 11667)
+++ trunk/psLib/src/types/psMetadataItemParse.c	(revision 11668)
@@ -38,18 +38,18 @@
 }
 
-psBool psMetadataItemParseBool(const psMetadataItem *item
-                              )
+bool psMetadataItemParseBool(const psMetadataItem *item
+                            )
 {
     PS_ASSERT_PTR_NON_NULL(item, false);
 
     switch (item->type) {
-        PS_METADATA_ITEM_PARSE_NUMBER(F32, Bool);
-        PS_METADATA_ITEM_PARSE_NUMBER(F64, Bool);
-        PS_METADATA_ITEM_PARSE_NUMBER(S8,  Bool);
-        PS_METADATA_ITEM_PARSE_NUMBER(S16, Bool);
-        PS_METADATA_ITEM_PARSE_NUMBER(S32, Bool);
-        PS_METADATA_ITEM_PARSE_NUMBER(U8,  Bool);
-        PS_METADATA_ITEM_PARSE_NUMBER(U16, Bool);
-        PS_METADATA_ITEM_PARSE_NUMBER(U32, Bool);
+        PS_METADATA_ITEM_PARSE_NUMBER(F32, BOOL);
+        PS_METADATA_ITEM_PARSE_NUMBER(F64, BOOL);
+        PS_METADATA_ITEM_PARSE_NUMBER(S8,  BOOL);
+        PS_METADATA_ITEM_PARSE_NUMBER(S16, BOOL);
+        PS_METADATA_ITEM_PARSE_NUMBER(S32, BOOL);
+        PS_METADATA_ITEM_PARSE_NUMBER(U8,  BOOL);
+        PS_METADATA_ITEM_PARSE_NUMBER(U16, BOOL);
+        PS_METADATA_ITEM_PARSE_NUMBER(U32, BOOL);
     case PS_DATA_BOOL:
         return item->data.B;
Index: trunk/psLib/src/types/psMetadataItemParse.h
===================================================================
--- trunk/psLib/src/types/psMetadataItemParse.h	(revision 11667)
+++ trunk/psLib/src/types/psMetadataItemParse.h	(revision 11668)
@@ -5,6 +5,6 @@
 *  @author EAM, PAP, JH, RHL, 
 *
-*  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2007-01-23 22:47:23 $
+*  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2007-02-06 21:36:09 $
 *
 *  Copyright 2004-2005 IfA, University of Hawaii
@@ -21,5 +21,5 @@
 
 // Parse a psMetadataItem as a particular type
-psBool psMetadataItemParseBool(const psMetadataItem *item);
+bool psMetadataItemParseBool(const psMetadataItem *item);
 psF32 psMetadataItemParseF32(const psMetadataItem *item);
 psF64 psMetadataItemParseF64(const psMetadataItem *item);