Skip to content
Snippets Groups Projects
Commit 43b05864 authored by Jorrit Fahlke's avatar Jorrit Fahlke
Browse files

[DUNE_BOOST_FUSION] Disable code that needs boost-fusion.

Fixing the autoconf test for boost-fusion now enables code that does not
compile.  Disable that code unconditionally so we can at least compile istl
until it is fixed.

[[Imported from SVN: r1301]]
parent 22c9ffac
No related branches found
No related tags found
No related merge requests found
......@@ -13,6 +13,11 @@
#include "istlexception.hh"
#ifdef HAVE_BOOST_FUSION
#warning The code which is normally enabled by HAVE_BOOST_FUSION has been
#warning disabled since it does not compile at the moment.
#endif
/*! \file
\brief Simple iterative methods like Jacobi, Gauss-Seidel, SOR, SSOR, etc.
in a generic way
......@@ -373,6 +378,7 @@ namespace Dune {
struct algmeta_itsteps {
#ifdef HAVE_BOOST_FUSION
#if 0
template<typename T11, typename T12, typename T13, typename T14,
typename T15, typename T16, typename T17, typename T18,
......@@ -388,6 +394,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 // 0
#endif
template<class M, class X, class Y, class K>
......@@ -419,6 +426,7 @@ namespace Dune {
}
#ifdef HAVE_BOOST_FUSION
#if 0
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,
......@@ -433,6 +441,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 // 0
#endif
template<class M, class X, class Y, class K>
......@@ -466,6 +475,7 @@ namespace Dune {
}
#ifdef HAVE_BOOST_FUSION
#if 0
template<typename T11, typename T12, typename T13, typename T14,
typename T15, typename T16, typename T17, typename T18,
......@@ -481,6 +491,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 // 0
#endif
template<class M, class X, class Y, class K>
......@@ -514,6 +525,7 @@ namespace Dune {
}
#ifdef HAVE_BOOST_FUSION
#if 0
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,
......@@ -528,6 +540,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 // 0
#endif
template<class M, class X, class Y, class K>
......
......@@ -4,6 +4,9 @@
#define DUNE_MultiTypeMATRIX_HH
#ifdef HAVE_BOOST_FUSION
#warning The code which is normally enabled by HAVE_BOOST_FUSION has been
#warning disabled since it does not compile at the moment.
#if 0
#include <cmath>
#include <iostream>
......@@ -450,6 +453,7 @@ namespace Dune {
} // end namespace
#endif // 0
#endif
#endif
......@@ -30,6 +30,10 @@
#include <dune/istl/multitypeblockvector.hh>
#include <dune/istl/multitypeblockmatrix.hh>
#ifdef HAVE_BOOST_FUSION
#warning The code which is normally enabled by HAVE_BOOST_FUSION has been
#warning disabled since it does not compile at the moment.
#endif
// a simple stop watch
class Timer
......@@ -509,6 +513,7 @@ void test_Interface ()
#ifdef HAVE_BOOST_FUSION
#if 0
void test_MultiTypeBlockVector_MultiTypeBlockMatrix() { //Jacobi Solver Test MultiTypeBlockMatrix_Solver::dbjac on MultiTypeBlockMatrix<BCRSMatrix>
......@@ -598,6 +603,7 @@ void test_MultiTypeBlockVector_MultiTypeBlockMatrix() {
printvector(std::cout,fusion::at_c<1>(x),"solution x2","entry",11,9,1);
}
#endif // 0
#endif
......@@ -615,7 +621,9 @@ int main (int argc , char ** argv)
test_Iter();
test_Interface();
#ifdef HAVE_BOOST_FUSION
#if 0
test_MultiTypeBlockVector_MultiTypeBlockMatrix();
#endif // 0
#endif
}
catch (Dune::ISTLError& error)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment