Merge pull request trilinos#5333 from trilinos/issue-5327

epetra: Fix for unguarded SuperLU macro
tcad-charon · Jun 6, 2019 · b06bad0 · b06bad0
2 parents 3a7d195 + f98c5e4
commit b06bad0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/packages/epetra/src/Epetra_IntMultiVector.h b/packages/epetra/src/Epetra_IntMultiVector.h
@@ -716,7 +716,9 @@ class EPETRA_LIB_DLL_EXPORT Epetra_IntMultiVector: public Epetra_DistObject, pub
 
   // Expert-only function
   //  SuperLU defines Reduce to be a macro in util.h
+#ifdef Reduce
 #undef Reduce
+#endif
   int Reduce();
 
  protected:

diff --git a/packages/epetra/src/Epetra_MultiVector.h b/packages/epetra/src/Epetra_MultiVector.h
@@ -985,6 +985,9 @@ class EPETRA_LIB_DLL_EXPORT Epetra_MultiVector: public Epetra_DistObject, public
   //@}
 
   // Expert-only function
+#ifdef Reduce
+#undef Reduce
+#endif
   int Reduce();
 
  protected: