From: Martin Kronbichler Date: Thu, 14 May 2015 12:04:42 +0000 (+0200) Subject: Include MueLu.hpp only in .cc file. X-Git-Tag: v8.3.0-rc1~173^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F934%2Fhead;p=dealii.git Include MueLu.hpp only in .cc file. --- diff --git a/include/deal.II/lac/trilinos_precondition.h b/include/deal.II/lac/trilinos_precondition.h index 62784dd179..4fce4157c2 100644 --- a/include/deal.II/lac/trilinos_precondition.h +++ b/include/deal.II/lac/trilinos_precondition.h @@ -38,11 +38,6 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include # include # include - -# if DEAL_II_TRILINOS_VERSION_GTE(11,14,0) -# include -# include -# endif DEAL_II_ENABLE_EXTRA_DIAGNOSTICS // forward declarations diff --git a/source/lac/trilinos_precondition.cc b/source/lac/trilinos_precondition.cc index b5e0bc6a13..e7582f617e 100644 --- a/source/lac/trilinos_precondition.cc +++ b/source/lac/trilinos_precondition.cc @@ -25,13 +25,15 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include # include # include +# include # include # include # include #if DEAL_II_TRILINOS_VERSION_GTE(11,14,0) -#include -#include +# include +# include +# include #endif DEAL_II_ENABLE_EXTRA_DIAGNOSTICS