Merge pull request #1985 from isuruf/flint23

Fix flint headers and replace use of deprecated funcs in flint2/3
symengine · Oct 31, 2023 · 9b2526f · 9b2526f
2 parents 724e8c3 + 4f337bd
commit 9b2526f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/bin/install_travis.sh b/bin/install_travis.sh
@@ -83,7 +83,7 @@ if [[ "${WITH_BENCHMARKS_GOOGLE}" == "yes" ]]; then
 fi
 
 if [[ "${WITH_PIRANHA}" == "yes" ]]; then
-    conda_pkgs="$conda_pkgs piranha=0.11 cmake=3.24.3"
+    conda_pkgs="$conda_pkgs piranha=0.11 cmake=3.24.3 'boost-cpp<1.79.0'"
 fi
 
 if [[ "${WITH_PRIMESIEVE}" == "yes" ]]; then

diff --git a/symengine/flint_wrapper.h b/symengine/flint_wrapper.h
@@ -6,6 +6,8 @@
 
 #include <flint/fmpz.h>
 #include <flint/fmpq.h>
+#include <flint/fmpz_poly.h>
+#include <flint/fmpz_poly_factor.h>
 #include <flint/fmpq_poly.h>
 
 namespace SymEngine
@@ -710,13 +712,15 @@ class fmpq_poly_wrapper
     }
     fmpq_poly_wrapper(const mpz_t z)
     {
+        fmpz_wrapper fz(z);
         fmpq_poly_init(poly);
-        fmpq_poly_set_mpz(poly, z);
+        fmpq_poly_set_fmpz(poly, fz.get_fmpz_t());
     }
     fmpq_poly_wrapper(const mpq_t q)
     {
+        fmpq_wrapper fq(q);
         fmpq_poly_init(poly);
-        fmpq_poly_set_mpq(poly, q);
+        fmpq_poly_set_fmpq(poly, fq.get_fmpq_t());
     }
     fmpq_poly_wrapper(const fmpq_wrapper &q)
     {