Merge from upstream.

This commit is contained in:
Bård Skaflestad 2012-04-13 15:57:11 +02:00
commit 9a935b0efb

View File

@ -24,9 +24,13 @@
#include <opm/core/linalg/LinearSolverIstl.hpp> #include <opm/core/linalg/LinearSolverIstl.hpp>
// Work around the fact that istl headers expect
// HAVE_BOOST to be 1, and not just defined.
#undef HAVE_BOOST
#define HAVE_BOOST 1
// TODO: clean up includes. // TODO: clean up includes.
#define DUNE_DEPRECATED #include <dune/common/deprecated.hh>
#include <dune/istl/bvector.hh> #include <dune/istl/bvector.hh>
#include <dune/istl/bcrsmatrix.hh> #include <dune/istl/bcrsmatrix.hh>
#include <dune/istl/operators.hh> #include <dune/istl/operators.hh>