From 7e3a869e8ec45dc756545fb9af99e78922e825d7 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Mon, 22 Oct 2012 10:10:07 +0000
Subject: [PATCH] Revert r7060 which reverted r6852

Diagonalmatrix was moved to dune-common in common:r6995 and istl:r1712

[[Imported from SVN: r7062]]
---
 dune/solvers/common/arithmetic.hh        | 2 +-
 dune/solvers/common/staticmatrixtools.hh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dune/solvers/common/arithmetic.hh b/dune/solvers/common/arithmetic.hh
index bc05477d..16fe0657 100644
--- a/dune/solvers/common/arithmetic.hh
+++ b/dune/solvers/common/arithmetic.hh
@@ -2,9 +2,9 @@
 #define ARITHMETIC_HH
 
 
+#include <dune/common/diagonalmatrix.hh>
 #include <dune/common/fvector.hh>
 #include <dune/common/fmatrix.hh>
-#include <dune/istl/diagonalmatrix.hh>
 #include <dune/istl/scaledidmatrix.hh>
 
 /** \brief Namespace containing helper classes and functions for arithmetic operations
diff --git a/dune/solvers/common/staticmatrixtools.hh b/dune/solvers/common/staticmatrixtools.hh
index e846b668..d21ff418 100644
--- a/dune/solvers/common/staticmatrixtools.hh
+++ b/dune/solvers/common/staticmatrixtools.hh
@@ -1,8 +1,8 @@
 #ifndef STATIC_MATRIX_TOOL_HH
 #define STATIC_MATRIX_TOOL_HH
 
+#include "dune/common/diagonalmatrix.hh"
 #include "dune/common/fmatrix.hh"
-#include "dune/istl/diagonalmatrix.hh"
 #include "dune/istl/scaledidmatrix.hh"
 #include "dune/istl/bcrsmatrix.hh"
 #include "dune/istl/matrixindexset.hh"
-- 
GitLab