From 3618bee74fbd30c933d83ac7e335793ea7a95a7d Mon Sep 17 00:00:00 2001
From: Wolfgang Bangerth <bangerth@math.tamu.edu>
Date: Fri, 28 Aug 1998 10:50:59 +0000
Subject: [PATCH] Remove cross dependencies of include files where forward
 declarations could be used.

git-svn-id: https://svn.dealii.org/trunk@535 0785d39b-7218-0410-832d-ea1e28bc413d
---
 deal.II/lac/include/lac/dfmatrix.h |  8 +++++---
 deal.II/lac/include/lac/dsmatrix.h | 14 +++++---------
 deal.II/lac/include/lac/dvector.h  |  2 +-
 deal.II/lac/include/lac/ivector.h  | 16 +++++++++++-----
 deal.II/lac/source/dfmatrix.cc     |  5 ++++-
 deal.II/lac/source/dsmatrix.cc     |  3 +++
 6 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/deal.II/lac/include/lac/dfmatrix.h b/deal.II/lac/include/lac/dfmatrix.h
index 5e4bc414a6..418db1360c 100644
--- a/deal.II/lac/include/lac/dfmatrix.h
+++ b/deal.II/lac/include/lac/dfmatrix.h
@@ -10,10 +10,12 @@
 // Revised by Wolfgang Bangerth
 
 
-#include <lac/dvector.h>
-#include <lac/ivector.h>
 #include <base/exceptions.h>
-#include <cstdio>
+
+
+// forward declarations
+class dVector;
+class iVector;
 
 
 
diff --git a/deal.II/lac/include/lac/dsmatrix.h b/deal.II/lac/include/lac/dsmatrix.h
index faf22d2124..4de7d590d6 100644
--- a/deal.II/lac/include/lac/dsmatrix.h
+++ b/deal.II/lac/include/lac/dsmatrix.h
@@ -11,19 +11,15 @@
 // Revised by Wolfgang Bangerth
 
 
-#ifndef __lac_dvector_h
-#include <lac/dvector.h>
-#endif
-#ifndef __lac_ivector_h
-#include <lac/ivector.h>
-#endif
-
 #include <base/exceptions.h>
 
 
-
+//forward declarations
+class dVector;
+class iVector;
 class ostream;
-template <int dim> class DoFHandler;
+
+
 
 /*
 CLASS
diff --git a/deal.II/lac/include/lac/dvector.h b/deal.II/lac/include/lac/dvector.h
index b8f72558f4..7c72d92f19 100644
--- a/deal.II/lac/include/lac/dvector.h
+++ b/deal.II/lac/include/lac/dvector.h
@@ -9,8 +9,8 @@
 // Roland Becker, Guido Kanschat, Franz-Theo Suttmeier
 // Revised by Wolfgang Bangerth
 
-#include <cstdio>
 #include <base/exceptions.h>
+#include <cstdio>
 
 
 
diff --git a/deal.II/lac/include/lac/ivector.h b/deal.II/lac/include/lac/ivector.h
index 8684a9e7e8..ce6ac8aa94 100644
--- a/deal.II/lac/include/lac/ivector.h
+++ b/deal.II/lac/include/lac/ivector.h
@@ -1,13 +1,14 @@
-// $Id$
+/*----------------------------   ivector.h     ---------------------------*/
+/*      $Id$                 */
+#ifndef __ivector_H
+#define __ivector_H
+/*----------------------------   ivector.h     ---------------------------*/
+
 
 // This file is part of the DEAL Library
 // DEAL is Copyright(1995) by
 // Roland Becker, Guido Kanschat, Franz-Theo Suttmeier
 
-
-#ifndef __lac_ivector_h
-#define __lac_ivector_h
-
 #include <base/exceptions.h>
 
 
@@ -187,4 +188,9 @@ inline int& iVector::operator() (unsigned int i)
 }
 
 
+
+
+/*----------------------------   ivector.h     ---------------------------*/
+/* end of #ifndef __ivector_H */
 #endif
+/*----------------------------   ivector.h     ---------------------------*/
diff --git a/deal.II/lac/source/dfmatrix.cc b/deal.II/lac/source/dfmatrix.cc
index 35591495f3..b344c7e095 100644
--- a/deal.II/lac/source/dfmatrix.cc
+++ b/deal.II/lac/source/dfmatrix.cc
@@ -1,9 +1,12 @@
 // $Id$
 
+#include <lac/dvector.h>
+#include <lac/ivector.h>
+#include <lac/dfmatrix.h>
+
 #include <cmath>
 #include <cstdlib>
 #include <cstdio>
-#include <lac/dfmatrix.h>
 #include <iomanip>
 
 
diff --git a/deal.II/lac/source/dsmatrix.cc b/deal.II/lac/source/dsmatrix.cc
index d6dcce0e3d..7afbf58e29 100644
--- a/deal.II/lac/source/dsmatrix.cc
+++ b/deal.II/lac/source/dsmatrix.cc
@@ -5,6 +5,9 @@
 // Roland Becker, Guido Kanschat, Franz-Theo Suttmeier
 
 #include <lac/dsmatrix.h>
+#include <lac/dvector.h>
+#include <lac/ivector.h>
+
 #include <iostream>
 #include <iomanip>
 #include <algorithm>
-- 
2.39.5