From 233ee1250895b0e9c15f583502d48ec3083935c6 Mon Sep 17 00:00:00 2001 From: Vassil Vassilev Date: Mon, 26 Oct 2015 09:50:26 +0100 Subject: [PATCH] Break circular module dependency. --- math/quadp/inc/TQpProbBase.h | 3 --- math/quadp/inc/TQpProbDens.h | 5 ++--- math/quadp/inc/TQpProbSparse.h | 3 --- math/quadp/src/TQpProbDens.cxx | 1 + math/quadp/src/TQpProbSparse.cxx | 1 + 5 files changed, 4 insertions(+), 9 deletions(-) diff --git a/math/quadp/inc/TQpProbBase.h b/math/quadp/inc/TQpProbBase.h index 487e59d0465d2..eecbac8ba5fd6 100644 --- 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 index 18dd0f9631c3f..8f52e1c581a8d 100644 --- 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 index 4d1089a268ce0..77aa83354bfad 100644 --- 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 index 0fecdb940ed8a..bfa33ac9b18f5 100644 --- 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 index 094c1cce1481d..3b735294c72f5 100644 --- 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" ////////////////////////////////////////////////////////////////////////// // //