Fix tagged pointer small integer bounds for 32/64-bit platforms

src/math/polynomial/polynomial.cpp

@@ -35,6 +35,7 @@ Module Name:
 #include "util/ref_buffer.h"
 #include "util/common_msgs.h"
 #include <memory>
+#include <numeric>
 
 namespace polynomial {
 
@@ -2687,7 +2688,7 @@ namespace polynomial {
                 }
                 if (j == 1 || j == -1)
                     return;
-                g = u_gcd(abs(j), g);
+                g = std::gcd(abs(j), g);
                 if (g == 1) 
                     return;
             }

src/sat/smt/pb_solver.cpp

@@ -16,7 +16,7 @@ Module Name:
 --*/
 
 #include <cmath>
-#include "util/mpz.h"
+#include <numeric>
 #include "sat/sat_types.h"
 #include "sat/smt/pb_solver.h"
 #include "sat/smt/euf_solver.h"
@@ -1250,7 +1250,7 @@ namespace pb {
                 g = coeff;
             }
             else {
-                g = u_gcd(g, coeff);
+                g = std::gcd(g, coeff);
             }
         }
 

src/smt/theory_pb.cpp

@@ -29,7 +29,7 @@ Module Name:
 #include "ast/rewriter/pb_rewriter_def.h"
 #include "math/simplex/sparse_matrix_def.h"
 #include "math/simplex/simplex_def.h"
-
+#include <numeric>
 
 namespace smt {
 
@@ -1788,7 +1788,7 @@ namespace smt {
                 g = static_cast<unsigned>(coeff);
             }
             else {
-                g = u_gcd(g, static_cast<unsigned>(coeff));
+                g = std::gcd(g, static_cast<unsigned>(coeff));
             }
         }
         if (g >= 2) {