From fa1cd206e36789a17184bd4e594760b344804042 Mon Sep 17 00:00:00 2001 From: Victor Brunini Date: Wed, 29 Jan 2025 10:14:50 -0700 Subject: [PATCH] Fix Amesos2 + SuperLU issue coming from EMPTY macro Signed-off-by: malphil --- packages/amesos2/src/Amesos2_Superlu_FunctionMap.hpp | 2 ++ packages/amesos2/src/Amesos2_Superludist_TypeMap.hpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/packages/amesos2/src/Amesos2_Superlu_FunctionMap.hpp b/packages/amesos2/src/Amesos2_Superlu_FunctionMap.hpp index 8ebeb9b57dbe..ae54c3bc591b 100644 --- a/packages/amesos2/src/Amesos2_Superlu_FunctionMap.hpp +++ b/packages/amesos2/src/Amesos2_Superlu_FunctionMap.hpp @@ -45,6 +45,8 @@ namespace SLU { #include "slu_util.h" #include "superlu_enum_consts.h" +#undef EMPTY + void at_plus_a( const int n, /* number of columns in matrix A. */ diff --git a/packages/amesos2/src/Amesos2_Superludist_TypeMap.hpp b/packages/amesos2/src/Amesos2_Superludist_TypeMap.hpp index cc62ecc204c1..8f5312732924 100644 --- a/packages/amesos2/src/Amesos2_Superludist_TypeMap.hpp +++ b/packages/amesos2/src/Amesos2_Superludist_TypeMap.hpp @@ -77,6 +77,8 @@ namespace SLUD { } #endif // HAVE_TEUCHOS_COMPLEX +#undef EMPTY + // multiplication of SLUD types template struct slu_dist_mult {};