Two minor fixes necessary for successful compilation with g++15

Martin D. Weinberg · Martin D. Weinberg · commit 9cb741ddfcc0 · 2025-08-25T14:19:28.000-04:00
diff --git a/expui/ParticleIterator.H b/expui/ParticleIterator.H
@@ -3,6 +3,7 @@
 
 #include <ParticleReader.H>
 #include <functional>
+#include <cstdint>
 
 namespace Utility
 {
diff --git a/exputil/GaussCore.c b/exputil/GaussCore.c
@@ -56,15 +56,13 @@ static int n1;
 void GaussMaster(int n, double alpha, double beta, int conflag,
 		 double abscis[], double weight[])
 {
-#define FALSE 0
-#define  TRUE 1
-    typedef int bool;
     int k, m;
     int below;
     double t, min, max, Glob;
     double delta, Qp;
     double temp;
     bool ok;
+
 #define junk1 &delta
 #define junk2 &Qp
     
@@ -170,7 +168,7 @@ void GaussMaster(int n, double alpha, double beta, int conflag,
 	     -Desirable improvement:
 	      include machine roundoff in equality tests.
 	  */
-	    ok= FALSE;
+	    ok= false;
 	    do {
 		if (Qp==0)  break;
 		delta/= -Qp;
@@ -182,7 +180,7 @@ void GaussMaster(int n, double alpha, double beta, int conflag,
 		    delta*= (1+t);
 		}
 		ok = (min <= temp) && (temp <= max);
-	    } while (FALSE);
+	    } while (false);
 
 	    if (ok) t=temp;		/* use Newton iterate... */
 	    else t= (min + max)/2;	/* ...or bisect to recover */
@@ -197,8 +195,6 @@ void GaussMaster(int n, double alpha, double beta, int conflag,
     }
 #undef junk1
 #undef junk2
-#undef  TRUE
-#undef FALSE
 }
 
 
diff --git a/include/cxxopts.H b/include/cxxopts.H
@@ -27,6 +27,7 @@ THE SOFTWARE.
 
 #include <cctype>
 #include <cstring>
+#include <cstdint>
 #include <exception>
 #include <iostream>
 #include <limits>

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`
`4`	`4`	`#include <ParticleReader.H>`
`5`	`5`	`#include <functional>`
	`6`	`+#include <cstdint>`
`6`	`7`
`7`	`8`	`namespace Utility`
`8`	`9`	`{`