From 515d79deb8ac42bbf050bb587de9a6543591cb59 Mon Sep 17 00:00:00 2001 From: Doug Torrance Date: Tue, 7 Nov 2023 13:13:40 -0500 Subject: [PATCH] Include flint headers last Otherwise we run into an issue on several architectures where flint and givaro define the same macro, causing build failures. --- M2/Macaulay2/e/aring-translate.hpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/M2/Macaulay2/e/aring-translate.hpp b/M2/Macaulay2/e/aring-translate.hpp index 9079505552d..367575f1b84 100644 --- a/M2/Macaulay2/e/aring-translate.hpp +++ b/M2/Macaulay2/e/aring-translate.hpp @@ -13,15 +13,17 @@ #include "aring-RRR.hpp" #include "aring-CCC.hpp" #include "aring-zz-gmp.hpp" -#include "aring-zz-flint.hpp" #include "aring-zzp.hpp" -#include "aring-zzp-flint.hpp" #include "aring-zzp-ffpack.hpp" #include "aring-qq.hpp" #include "aring-m2-gf.hpp" +#include "aring-tower.hpp" + +// include flint headers last to avoid #1674 +#include "aring-zz-flint.hpp" +#include "aring-zzp-flint.hpp" #include "aring-gf-flint-big.hpp" #include "aring-gf-flint.hpp" -#include "aring-tower.hpp" namespace M2 { template