Break circular module dependency.

saberduck · Nov 13, 2015 · 233ee12 · 233ee12
1 parent 41555f4
commit 233ee12
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 9 deletions.
diff --git a/math/quadp/inc/TQpProbBase.h b/math/quadp/inc/TQpProbBase.h
@@ -53,9 +53,6 @@
 #ifndef ROOT_TQpDataBase
 #include "TQpDataBase.h"
 #endif
-#ifndef ROOT_TQpLinSolverBase
-#include "TQpLinSolverBase.h"
-#endif
 #ifndef ROOT_TQpResidual
 #include "TQpResidual.h"
 #endif

diff --git a/math/quadp/inc/TQpProbDens.h b/math/quadp/inc/TQpProbDens.h
@@ -50,9 +50,6 @@
 #ifndef ROOT_TQpVars
 #include "TQpVar.h"
 #endif
-#ifndef ROOT_TQpLinSolverDens
-#include "TQpLinSolverDens.h"
-#endif
 
 //////////////////////////////////////////////////////////////////////////
 //                                                                      //
@@ -62,6 +59,8 @@
 //                                                                      //
 //////////////////////////////////////////////////////////////////////////
 
+class TQpLinSolverBase;
+
 class TQpProbDens : public TQpProbBase
 {
 

diff --git a/math/quadp/inc/TQpProbSparse.h b/math/quadp/inc/TQpProbSparse.h
@@ -50,9 +50,6 @@
 #ifndef ROOT_TQpVars
 #include "TQpVar.h"
 #endif
-#ifndef ROOT_TQpLinSolverSparse
-#include "TQpLinSolverSparse.h"
-#endif
 
 //////////////////////////////////////////////////////////////////////////
 //                                                                      //

diff --git a/math/quadp/src/TQpProbDens.cxx b/math/quadp/src/TQpProbDens.cxx
@@ -42,6 +42,7 @@
 
 #include "TQpProbDens.h"
 #include "TMatrixD.h"
+#include "TQpLinSolverDens.h"
 
 //////////////////////////////////////////////////////////////////////////
 //                                                                      //

diff --git a/math/quadp/src/TQpProbSparse.cxx b/math/quadp/src/TQpProbSparse.cxx
@@ -42,6 +42,7 @@
 
 #include "TQpProbSparse.h"
 #include "TMatrixD.h"
+#include "TQpLinSolverSparse.h"
 
 //////////////////////////////////////////////////////////////////////////
 //                                                                      //