diff --git a/dune/istl/gsetc.hh b/dune/istl/gsetc.hh index 9851f10de226080dedae00a637e676a5f9a2e9f8..d411069e4852b1e3af891fcab6bc176b5701b883 100644 --- a/dune/istl/gsetc.hh +++ b/dune/istl/gsetc.hh @@ -373,6 +373,7 @@ namespace Dune { template<int I> struct algmeta_itsteps { +#if HAVE_BOOST #ifdef HAVE_BOOST_FUSION template<typename T11, typename T12, typename T13, typename T14, @@ -389,6 +390,7 @@ namespace Dune { boost::mpl::size<MultiTypeBlockMatrix<T11,T12,T13,T14,T15,T16,T17,T18,T19> >::value; Dune::MultiTypeBlockMatrix_Solver<I,0,rowcount>::dbgs(A, x, b, w); } +#endif #endif template<class M, class X, class Y, class K> @@ -419,7 +421,9 @@ namespace Dune { x.axpy(1-w,xold); } +#if HAVE_BOOST #ifdef HAVE_BOOST_FUSION + template<typename T11, typename T12, typename T13, typename T14, typename T15, typename T16, typename T17, typename T18, typename T19, typename T21, typename T22, typename T23, @@ -434,6 +438,7 @@ namespace Dune { boost::mpl::size<MultiTypeBlockMatrix<T11,T12,T13,T14,T15,T16,T17,T18,T19> >::value; Dune::MultiTypeBlockMatrix_Solver<I,0,rowcount>::bsorf(A, x, b, w); } +#endif #endif template<class M, class X, class Y, class K> @@ -466,6 +471,7 @@ namespace Dune { } } +#if HAVE_BOOST #ifdef HAVE_BOOST_FUSION template<typename T11, typename T12, typename T13, typename T14, @@ -482,6 +488,7 @@ namespace Dune { mpl::size<MultiTypeBlockMatrix<T11,T12,T13,T14,T15,T16,T17,T18,T19> >::value; Dune::MultiTypeBlockMatrix_Solver<I,rowcount-1,rowcount>::bsorb(A, x, b, w); } +#endif #endif template<class M, class X, class Y, class K> @@ -514,7 +521,9 @@ namespace Dune { } } +#if HAVE_BOOST #ifdef HAVE_BOOST_FUSION + template<typename T11, typename T12, typename T13, typename T14, typename T15, typename T16, typename T17, typename T18, typename T19, typename T21, typename T22, typename T23, @@ -529,6 +538,7 @@ namespace Dune { boost::mpl::size<MultiTypeBlockMatrix<T11,T12,T13,T14,T15,T16,T17,T18,T19> >::value; Dune::MultiTypeBlockMatrix_Solver<I,0,rowcount >::dbjac(A, x, b, w); } +#endif #endif template<class M, class X, class Y, class K> diff --git a/dune/istl/multitypeblockmatrix.hh b/dune/istl/multitypeblockmatrix.hh index a514c076959ffd885f6f47a3dd9adf2e86d59143..eb7ab3e2d32ad04caedc588c3f7328958b8dd405 100644 --- a/dune/istl/multitypeblockmatrix.hh +++ b/dune/istl/multitypeblockmatrix.hh @@ -8,6 +8,7 @@ #include "istlexception.hh" +#if HAVE_BOOST #ifdef HAVE_BOOST_FUSION #include <boost/fusion/sequence.hpp> @@ -207,6 +208,9 @@ namespace Dune { @brief A Matrix class to support different block types This matrix class combines MultiTypeBlockVector elements as rows. + + You must add BOOST_CPPFLAGS and BOOT_LDFLAGS to the CPPFLAGS and LDFLAGS during + compilation, respectively, to use this class */ template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9> @@ -459,5 +463,5 @@ namespace Dune { } // end namespace #endif // HAVE_BOOST_FUSION - +#endif // HAVE_BOOST #endif diff --git a/dune/istl/multitypeblockvector.hh b/dune/istl/multitypeblockvector.hh index 5246599887c1c673c2ff44e785303d412738bf5b..f2c336bee95bb4b246fbe7076173482b5ec5fac6 100644 --- a/dune/istl/multitypeblockvector.hh +++ b/dune/istl/multitypeblockvector.hh @@ -3,6 +3,7 @@ #ifndef DUNE_MULTITYPEVECTOR_HH #define DUNE_MULTITYPEVECTOR_HH +#if HAVE_BOOST #ifdef HAVE_BOOST_FUSION #include <cmath> @@ -228,6 +229,9 @@ namespace Dune { @brief A Vector class to support different block types This vector class combines elements of different types known at compile-time. + + You must add BOOST_CPPFLAGS and BOOT_LDFLAGS to the CPPFLAGS and LDFLAGS during + compilation, respectively, to use this class */ template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9> @@ -306,6 +310,7 @@ namespace Dune { } // end namespace -#endif +#endif // end HAVE_BOOST_FUSION +#endif // end HAVE_BOOST #endif