Skip to content

Commit

Permalink
Merge pull request #13756 from trilinos/malachi/add-undef-empty-to-am…
Browse files Browse the repository at this point in the history
…esos2-superlu

DO NOT MERGE: Amesos2: Fix Amesos2 + SuperLU issue coming from EMPTY macro
  • Loading branch information
jhux2 authored Jan 30, 2025
2 parents c314124 + fa1cd20 commit dd1423b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions packages/amesos2/src/Amesos2_Superlu_FunctionMap.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down
2 changes: 2 additions & 0 deletions packages/amesos2/src/Amesos2_Superludist_TypeMap.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ namespace SLUD {
}
#endif // HAVE_TEUCHOS_COMPLEX

#undef EMPTY

// multiplication of SLUD types
template <typename slu_scalar_t, typename slu_mag_t>
struct slu_dist_mult {};
Expand Down

0 comments on commit dd1423b

Please sign in to comment.