diff --git a/dune/solvers/common/CMakeLists.txt b/dune/solvers/common/CMakeLists.txt index b3d3fddc796b1374246c5cf7f81d3f180e528679..5e1f8f125cd29c9124132bd76c29d45caf98478e 100644 --- a/dune/solvers/common/CMakeLists.txt +++ b/dune/solvers/common/CMakeLists.txt @@ -1,5 +1,4 @@ install(FILES - arithmetic.hh boxconstraint.hh canignore.hh copyorreference.hh diff --git a/dune/solvers/common/arithmetic.hh b/dune/solvers/common/arithmetic.hh deleted file mode 100644 index 19b47860e25602d2df290d6ee50ca8ab69b10c14..0000000000000000000000000000000000000000 --- a/dune/solvers/common/arithmetic.hh +++ /dev/null @@ -1,30 +0,0 @@ -// -*- tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- -// vi: set et ts=8 sw=4 sts=4: -#ifndef ARITHMETIC_HH -#define ARITHMETIC_HH - -#warning arithmetic.hh is deprecated, please use dune-matrix-vector instead! - -#include <dune/matrix-vector/axpy.hh> -#include <dune/matrix-vector/axy.hh> -#include <dune/matrix-vector/crossproduct.hh> -#include <dune/matrix-vector/matrixtraits.hh> -#include <dune/matrix-vector/promote.hh> -#include <dune/matrix-vector/scalartraits.hh> -#include <dune/matrix-vector/transpose.hh> - -namespace Arithmetic -{ - using Dune::MatrixVector::Promote; - using Dune::MatrixVector::ScalarTraits; - using Dune::MatrixVector::MatrixTraits; - using Dune::MatrixVector::Transposed; - using Dune::MatrixVector::addProduct; - using Dune::MatrixVector::subtractProduct; - using Dune::MatrixVector::crossProduct; - using Dune::MatrixVector::transpose; - using Dune::MatrixVector::Axy; - using Dune::MatrixVector::bmAxy; -} - -#endif diff --git a/dune/solvers/common/staticmatrixtools.hh b/dune/solvers/common/staticmatrixtools.hh index 31d9c96fac920920325cc641d4ea28ec50da8267..a5f1f6f7f94cb0d4149a34afa369657cd92cc955 100644 --- a/dune/solvers/common/staticmatrixtools.hh +++ b/dune/solvers/common/staticmatrixtools.hh @@ -16,8 +16,6 @@ #include <dune/matrix-vector/scalartraits.hh> #include <dune/matrix-vector/transformmatrix.hh> -#include "arithmetic.hh" - namespace StaticMatrix { // type promotion (smallest matrix that can hold the sum of two matrices *******************