Skip to content

Commit

Permalink
Make more headers/sources self contained.
Browse files Browse the repository at this point in the history
Either include the missing header files or add forward declarations,
where the complete types are not required.
  • Loading branch information
vgvassilev committed Nov 13, 2015
1 parent a08d118 commit 6ec7b5c
Show file tree
Hide file tree
Showing 53 changed files with 98 additions and 16 deletions.
3 changes: 2 additions & 1 deletion graf3d/eve/src/TEveTrans.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@
#include "TEveTrans.h"
#include "TEveUtil.h"

#include "TMath.h"
#include "TBuffer.h"
#include "TClass.h"
#include "TMath.h"

#include "Riostream.h"

Expand Down
1 change: 1 addition & 0 deletions gui/recorder/src/TRecorder.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@
#include "TFile.h"
#include "TTimer.h"
#include "TTree.h"
#include "TSystem.h"
#include "TMutex.h"
#include "TGButton.h"
#include "TGFileDialog.h"
Expand Down
3 changes: 3 additions & 0 deletions hist/hist/inc/TBackCompFitter.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
#include "TVirtualFitter.h"
#endif

#include "Fit/BasicFCN.h"
#include "Fit/FitResult.h"

#ifndef ROOT_Fit_Fitter
#include "Fit/Fitter.h"
#endif
Expand Down
2 changes: 2 additions & 0 deletions hist/hist/inc/THnSparse_Internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
#include "TArrayD.h"
#endif

#include "TObject.h"

class TBrowser;
class TH1;
class THnSparse;
Expand Down
5 changes: 3 additions & 2 deletions hist/hist/src/AnalyticalIntegrals.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,15 @@
//
//

#include <stdio.h>
#include "AnalyticalIntegrals.h"

#include "TROOT.h"
#include "TF1.h"
#include "TFormula.h"
#include "TMath.h"
#include "AnalyticalIntegrals.h"
#include "Math/DistFuncMathCore.h" //for cdf

#include <stdio.h>

using namespace std;

Expand Down
2 changes: 2 additions & 0 deletions hist/hist/src/AnalyticalIntegrals.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
#ifndef ROOT_AnalyticalIntegrals_h
#define ROOT_AnalyticalIntegrals_h

#include "RtypesCore.h"

class TF1;
Double_t AnalyticalIntegral(TF1 *f, Double_t a, Double_t b);

Expand Down
1 change: 1 addition & 0 deletions hist/hist/src/HFitImpl.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include "THnBase.h"

#include "Fit/Fitter.h"
#include "Fit/FitConfig.h"
#include "Fit/BinData.h"
#include "Fit/UnBinData.h"
#include "Fit/Chi2FCN.h"
Expand Down
1 change: 1 addition & 0 deletions hist/hist/src/TBackCompFitter.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ class before issuing a new fit to avoid deleting this information.
#include "HFitInterface.h"
#include "Math/Minimizer.h"
#include "Fit/BinData.h"
#include "Fit/FitConfig.h"
#include "Fit/UnBinData.h"
#include "Fit/PoissonLikelihoodFCN.h"
#include "Fit/LogLikelihoodFCN.h"
Expand Down
1 change: 1 addition & 0 deletions hist/hist/src/TBinomialEfficiencyFitter.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ weighted histograms (because the likelihood computation will be incorrect).
#include "TF1.h"
#include "TF2.h"
#include "TF3.h"
#include "Fit/FitConfig.h"
#include "Fit/Fitter.h"
#include "TFitResult.h"
#include "Math/Functor.h"
Expand Down
1 change: 1 addition & 0 deletions hist/hist/src/TFractionFitter.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ Any serious inconsistency results in an error.
#include "TMath.h"
#include "TClass.h"

#include "Fit/FitConfig.h"
#include "Fit/Fitter.h"
#include "TFitResult.h"
#include "Math/Functor.h"
Expand Down
1 change: 1 addition & 0 deletions hist/hist/src/THnBase.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#include "TVirtualPad.h"

#include "HFitInterface.h"
#include "Fit/DataRange.h"
#include "Fit/SparseData.h"
#include "Math/MinimizerOptions.h"
#include "Math/WrappedMultiTF1.h"
Expand Down
12 changes: 8 additions & 4 deletions math/genetic/inc/Math/GeneticMinimizer.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,16 @@
#ifndef ROOT_Math_GeneticMinimizer
#define ROOT_Math_GeneticMinimizer

#include <vector>

#include "Math/Minimizer.h"

#include "TMVA/IFitterTarget.h"
#include "TMVA/Interval.h"
#include "RtypesCore.h"

#include <vector>

namespace TMVA {
class IFitterTarget;
class Interval;
}

namespace ROOT {
namespace Math {
Expand Down
1 change: 1 addition & 0 deletions math/mathcore/inc/Fit/BasicFCN.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include "Math/IParamFunction.h"
#endif

#include "Math/IParamFunctionfwd.h"

#include <memory>

Expand Down
2 changes: 2 additions & 0 deletions math/mathcore/inc/Fit/Chi2FCN.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
#include "Math/IParamFunction.h"
#endif

#include "Math/IFunction.h"
#include "Math/IFunctionfwd.h"

#ifndef ROOT_Fit_BinData
#include "Fit/BinData.h"
Expand Down
2 changes: 2 additions & 0 deletions math/mathcore/inc/Math/TDataPoint.icc
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
#ifndef ROOT_TDataPoint_ICC
#define ROOT_TDataPoint_ICC

#include <cassert>

namespace ROOT
{
namespace Math
Expand Down
4 changes: 4 additions & 0 deletions math/mathcore/src/BasicMinimizer.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@

#include "Math/IFunction.h"

#include "Math/IFunctionfwd.h"

#include "Math/IParamFunctionfwd.h"

#include "Math/FitMethodFunction.h"

#include "Math/MinimTransformFunction.h"
Expand Down
1 change: 1 addition & 0 deletions math/mathcore/src/BinData.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

#include "Fit/BinData.h"
#include "Math/Error.h"
#include "Math/IParamFunctionfwd.h"

#include <cassert>
#include <cmath>
Expand Down
1 change: 1 addition & 0 deletions math/mathcore/src/BrentMethods.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

#include "Math/BrentMethods.h"
#include "Math/IFunction.h"
#include "Math/IFunctionfwd.h"

#include <cmath>
#include <algorithm>
Expand Down
1 change: 1 addition & 0 deletions math/mathcore/src/BrentMinimizer1D.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#include "Math/BrentMinimizer1D.h"
#include "Math/BrentMethods.h"
#include "Math/IFunction.h"
#include "Math/IFunctionfwd.h"

#ifndef ROOT_Math_Error
#include "Math/Error.h"
Expand Down
1 change: 1 addition & 0 deletions math/mathcore/src/BrentRootFinder.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

#include "Math/BrentRootFinder.h"
#include "Math/BrentMethods.h"
#include "Math/IFunctionfwd.h"
#include <cmath>

#ifndef ROOT_Math_Error
Expand Down
2 changes: 2 additions & 0 deletions math/mathcore/src/Delaunay2D.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
// Implementation file for class Delaunay2D

#include "Math/Delaunay2D.h"
#include "Rtypes.h"

//#include <thread>

Expand All @@ -22,6 +23,7 @@
#endif

#include <algorithm>
#include <stdlib.h>

namespace ROOT {

Expand Down
1 change: 1 addition & 0 deletions math/mathcore/src/DistSampler.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include "Math/Error.h"

#include "Math/IFunction.h"
#include "Math/IFunctionfwd.h"
#include "Fit/BinData.h"
#include "Fit/UnBinData.h"
#include "Fit/DataRange.h"
Expand Down
2 changes: 2 additions & 0 deletions math/mathcore/src/FitUtil.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
#include "Fit/UnBinData.h"
//#include "Fit/BinPoint.h"

#include "Math/IFunctionfwd.h"
#include "Math/IParamFunction.h"
#include "Math/IParamFunctionfwd.h"
#include "Math/Integrator.h"
#include "Math/IntegratorMultiDim.h"
#include "Math/WrappedFunction.h"
Expand Down
5 changes: 5 additions & 0 deletions math/mathcore/src/Fitter.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,15 @@
#include "Fit/LogLikelihoodFCN.h"
#include "Math/Minimizer.h"
#include "Math/MinimizerOptions.h"
#include "Math/FitMethodFunction.h"
#include "Fit/BasicFCN.h"
#include "Fit/BinData.h"
#include "Fit/UnBinData.h"
#include "Fit/FcnAdapter.h"
#include "Fit/FitConfig.h"
#include "Fit/FitResult.h"
#include "Math/Error.h"
#include "TF1.h"

#include <memory>

Expand Down
3 changes: 3 additions & 0 deletions math/mathcore/src/GaussIntegrator.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@
**********************************************************************/

#include "Math/GaussIntegrator.h"
#include "Math/Error.h"
#include "Math/IntegratorOptions.h"
#include "Math/IFunction.h"
#include "Math/IFunctionfwd.h"
#include <cmath>

namespace ROOT {
Expand Down
4 changes: 4 additions & 0 deletions math/mathcore/src/GaussLegendreIntegrator.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
**********************************************************************/

#include "Math/GaussLegendreIntegrator.h"
#include "Math/Error.h"
#include "Math/IFunction.h"
#include "Math/IFunctionfwd.h"
#include "Math/IntegratorOptions.h"
#include <cmath>
#include <string.h>
#include <algorithm>
Expand Down
3 changes: 3 additions & 0 deletions math/mathcore/src/GoFTest.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,11 @@

#include "Math/Error.h"
#include "Math/Math.h"
#include "Math/IFunction.h"
#include "Math/IFunctionfwd.h"
#include "Math/Integrator.h"
#include "Math/ProbFuncMathCore.h"
#include "Math/WrappedFunction.h"

#include "Math/GoFTest.h"

Expand Down
1 change: 1 addition & 0 deletions math/mathcore/src/MinimTransformFunction.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
// Implementation file for class MinimTransformFunction

#include "Math/MinimTransformFunction.h"
#include "Math/IFunctionfwd.h"

//#include <iostream>
#include <cmath>
Expand Down
1 change: 1 addition & 0 deletions math/mathcore/src/RichardsonDerivator.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
**********************************************************************/

#include "Math/RichardsonDerivator.h"
#include "Math/IFunctionfwd.h"
#include <cmath>
#include <limits>

Expand Down
1 change: 1 addition & 0 deletions math/mathcore/src/SparseData.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include <limits>

// #include "TMath.h"
#include "Fit/BinData.h"
#include "Fit/SparseData.h"

using namespace std;
Expand Down
1 change: 1 addition & 0 deletions math/mathcore/src/UnBinData.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
// Implementation file for class UnBinData

#include "Fit/UnBinData.h"
#include "Fit/DataVector.h"
#include "Math/Error.h"

#include <cassert>
Expand Down
2 changes: 2 additions & 0 deletions math/minuit/src/TLinearMinimizer.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
#include "TF1.h"
#include "TUUID.h"
#include "TROOT.h"
#include "Fit/BasicFCN.h"
#include "Fit/BinData.h"
#include "Fit/Chi2FCN.h"

#include "TLinearFitter.h"
Expand Down
2 changes: 1 addition & 1 deletion math/minuit2/src/SimplexBuilder.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ namespace ROOT {

//#define DEBUG 1
class GradientCalculator;
jobsclass MnStrategy;
class MnStrategy;
FunctionMinimum SimplexBuilder::Minimum(const MnFcn& mfcn, const GradientCalculator&, const MinimumSeed& seed, const MnStrategy&, unsigned int maxfcn, double minedm) const {
// find the minimum using the Simplex method of Nelder and Mead (does not use function gradient)
// method to find initial simplex is slightly different than in the orginal Fortran
Expand Down
1 change: 1 addition & 0 deletions math/smatrix/inc/Math/BinaryOperators.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#ifndef ROOT_Math_BinaryOpPolicy
#include "Math/BinaryOpPolicy.h"
#endif
#include "Math/Expression.h"

namespace ROOT {

Expand Down
1 change: 1 addition & 0 deletions misc/table/inc/TGenericTable.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#define ROOT_TGenericTable

#include "TTable.h"
#include "TTableDescriptor.h"

//////////////////////////////////////////////////////////////////////////
// //
Expand Down
1 change: 0 additions & 1 deletion misc/table/inc/TTable.h
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,5 @@ inline void TTable::Draw(Option_t *opt)
//________________________________________________________________________________________________________________
inline UInt_t TTable::piterator::Column() const { return fCurrentColIndex;}
#endif
#include "TTableDescriptor.h"

#endif
2 changes: 2 additions & 0 deletions misc/table/src/TIndexTable.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@

#include "TIndexTable.h"

#include "TTableDescriptor.h"

//////////////////////////////////////////////////////////////////////////////
// TIndexTable class is helper class to keep the list of the referencs to the
// TTable rows and iterate over it.
Expand Down
4 changes: 4 additions & 0 deletions net/http/inc/THttpServer.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
#include "TMutex.h"
#endif

#ifndef ROOT_TNamed
#include "TNamed.h"
#endif

#ifndef ROOT_THttpCallArg
#include "THttpCallArg.h"
#endif
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@
#include "RooRealVar.h"
#include "RooProduct.h"
#include "RooStats/HistFactory/Measurement.h"
#include "RooStats/ModelConfig.h"


namespace RooStats {
class ModelConfig;
namespace HistFactory {

class HistFactoryNavigation {
Expand Down
1 change: 1 addition & 0 deletions roofit/histfactory/src/HistFactoryNavigation.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include "RooSimultaneous.h"
#include "RooWorkspace.h"

#include "RooStats/ModelConfig.h"
#include "RooStats/HistFactory/HistFactoryNavigation.h"
#include "RooStats/HistFactory/HistFactoryException.h"

Expand Down
Loading

0 comments on commit 6ec7b5c

Please sign in to comment.