]> https://gitweb.dealii.org/ - dealii.git/commitdiff
fix compilation without trilinos 1560/head
authorTimo Heister <timo.heister@gmail.com>
Tue, 8 Sep 2015 17:55:10 +0000 (13:55 -0400)
committerTimo Heister <timo.heister@gmail.com>
Tue, 8 Sep 2015 17:55:10 +0000 (13:55 -0400)
source/lac/trilinos_precondition_muelu.cc

index 61288362c27bce1a4bb466a560aaf5ef4cfc4107..149783fb9f9c17541609ad5e22d377c2156eec4f 100644 (file)
@@ -15,7 +15,8 @@
 
 #include <deal.II/lac/trilinos_precondition.h>
 
-#if defined(DEAL_II_WITH_TRILINOS) && DEAL_II_TRILINOS_VERSION_GTE(11,14,0)
+#ifdef DEAL_II_WITH_TRILINOS
+#if DEAL_II_TRILINOS_VERSION_GTE(11,14,0)
 
 #  include <deal.II/lac/vector.h>
 #  include <deal.II/lac/sparse_matrix.h>
@@ -325,4 +326,5 @@ namespace TrilinosWrappers
 
 DEAL_II_NAMESPACE_CLOSE
 
+#endif // DEAL_II_TRILINOS_VERSION_GTE(11,14,0)
 #endif // DEAL_II_WITH_TRILINOS

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.