diff --git a/dune/solvers/common/genericvectortools.hh b/dune/solvers/common/genericvectortools.hh index 3e064ac6dcda11167327df873daff1ba0edb6612..10ce74d5d497b25523abdd809260e94d5839c821 100644 --- a/dune/solvers/common/genericvectortools.hh +++ b/dune/solvers/common/genericvectortools.hh @@ -11,7 +11,6 @@ #include <dune/common/diagonalmatrix.hh> #include <dune/common/fvector.hh> #include <dune/common/fmatrix.hh> -#include <dune/common/static_assert.hh> #include <dune/common/diagonalmatrix.hh> #include <dune/istl/scaledidmatrix.hh> @@ -183,7 +182,7 @@ struct GenericVector template <class LVectorBlock, class RVectorBlock> static void interlace(const Dune::BlockVector<Dune::BlockVector<LVectorBlock> >& lvec, Dune::BlockVector<RVectorBlock>& rvec) { - dune_static_assert(RVectorBlock::dimension % LVectorBlock::dimension == 0, "Block sizes don't match."); + static_assert(RVectorBlock::dimension % LVectorBlock::dimension == 0, "Block sizes don't match."); rvec.resize(lvec[0].size()); rvec = 0.0; @@ -206,7 +205,7 @@ struct GenericVector template <class LVectorBlock, class RVectorBlock> static void deinterlace(const Dune::BlockVector<LVectorBlock>& lvec, Dune::BlockVector<Dune::BlockVector<RVectorBlock> >& rvec) { - dune_static_assert(LVectorBlock::dimension % RVectorBlock::dimension == 0, "Block sizes don't match."); + static_assert(LVectorBlock::dimension % RVectorBlock::dimension == 0, "Block sizes don't match."); rvec.resize(LVectorBlock::dimension / RVectorBlock::dimension); for (size_t k=0; k<rvec.size(); ++k) @@ -274,7 +273,7 @@ struct GenericMatrix template <class field_type, int n, int m, class BitVectorTypeR, class BitVectorTypeC> static void truncate(Dune::FieldMatrix<field_type,n,m>& mat, const BitVectorTypeR& trows, const BitVectorTypeC& tcols, bool setTruncatedDiagonalOne) { -// dune_static_assert(BitVectorTypeR.size()==n and BitVectorTypeC.size()==m,"BitVector length doesn't match matrix size."); +// static_assert(BitVectorTypeR.size()==n and BitVectorTypeC.size()==m,"BitVector length doesn't match matrix size."); assert(trows.size()==n and tcols.size()==m); for(size_t row=0; row<n; ++row)