API tools faq
paste
GoddamnIDontNeedAUse

Untitled

GoddamnIDontNeedAUse
Feb 13th, 2017
102
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 6.68 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/graf2d/cocoa/src/CocoaPrivate.h b/graf2d/cocoa/src/CocoaPrivate.h
  2. index 2614feeaeb..321ef894a6 100644
  3. --- a/graf2d/cocoa/src/CocoaPrivate.h
  4. +++ b/graf2d/cocoa/src/CocoaPrivate.h
  5. @@ -24,23 +24,21 @@
  6.  #endif
  7.  #ifndef ROOT_X11Events
  8.  #include "X11Events.h"
  9.  #endif
  10.  #ifndef ROOT_X11Buffer
  11.  #include "X11Buffer.h"
  12.  #endif
  13.  #ifndef ROOT_GuiTypes
  14.  #include "GuiTypes.h"
  15.  #endif
  16. -#ifndef ROOT_GuiFonts
  17.  #include "FontCache.h"
  18. -#endif
  19.  
  20.  @protocol X11Drawable;
  21.  @protocol X11Window;
  22.  
  23.  @class ROOTApplicationDelegate;
  24.  @class NSOpenGLContext;
  25.  @class NSObject;
  26.  
  27.  @class QuartzWindow;
  28.  
  29. diff --git a/hist/histpainter/inc/TGraphPainter.h b/hist/histpainter/inc/TGraphPainter.h
  30. index beecd2f8eb..5bf7fc6af4 100644
  31. --- a/hist/histpainter/inc/TGraphPainter.h
  32. +++ b/hist/histpainter/inc/TGraphPainter.h
  33. @@ -14,23 +14,21 @@
  34.  
  35.  
  36.  //////////////////////////////////////////////////////////////////////////
  37.  //                                                                      //
  38.  // TGraphPainter                                                        //
  39.  //                                                                      //
  40.  // helper class to draw graphs                                          //
  41.  //                                                                      //
  42.  //////////////////////////////////////////////////////////////////////////
  43.  
  44. -#ifndef ROOT_Object
  45.  #include "TVirtualGraphPainter.h"
  46. -#endif
  47.  
  48.  class TGraph;
  49.  class TF1;
  50.  
  51.  class TGraphPainter : public TVirtualGraphPainter {
  52.  
  53.  public:
  54.  
  55.     TGraphPainter();
  56.  
  57. diff --git a/io/io/inc/TMakeProject.h b/io/io/inc/TMakeProject.h
  58. index 0c9a2142fb..ae56c26631 100644
  59. --- a/io/io/inc/TMakeProject.h
  60. +++ b/io/io/inc/TMakeProject.h
  61. @@ -6,23 +6,21 @@
  62.   * All rights reserved.                                                  *
  63.   *                                                                       *
  64.   * For the licensing terms see $ROOTSYS/LICENSE.                         *
  65.   * For the list of contributors see $ROOTSYS/README/CREDITS.             *
  66.   *************************************************************************/
  67.  
  68.  #ifndef ROOT_TMakeProject
  69.  #define ROOT_TMakeProject
  70.  
  71.  #include <stdio.h>
  72. -#ifndef ROOT_TOBJECT_H
  73.  #include "TString.h"
  74. -#endif
  75.  
  76.  class TList;
  77.  class TVirtualStreamerInfo;
  78.  class TStreamerElement;
  79.  
  80.  class TMakeProject
  81.  {
  82.  private:
  83.     static void GenerateMissingStreamerInfo(TList *extrainfos, const char *clname, Bool_t iscope);
  84.  public:
  85. diff --git a/math/mathcore/inc/Math/BasicMinimizer.h b/math/mathcore/inc/Math/BasicMinimizer.h
  86. index 6c2dfbbdf7..3bc27834e7 100644
  87. --- a/math/mathcore/inc/Math/BasicMinimizer.h
  88. +++ b/math/mathcore/inc/Math/BasicMinimizer.h
  89. @@ -20,23 +20,21 @@
  90.  
  91.  
  92.  #ifndef ROOT_Math_IFunctionfwd
  93.  #include "Math/IFunctionfwd.h"
  94.  #endif
  95.  
  96.  #ifndef ROOT_Math_IParamFunctionfwd
  97.  #include "Math/IParamFunctionfwd.h"
  98.  #endif
  99.  
  100. -#ifndef ROOT_Math_MinimTransformVariable
  101.  #include "Math/MinimTransformVariable.h"
  102. -#endif
  103.  
  104.  
  105.  #include <vector>
  106.  #include <map>
  107.  #include <string>
  108.  
  109.  
  110.  
  111.  namespace ROOT {
  112.  
  113. diff --git a/math/mathcore/inc/Math/MinimTransformFunction.h b/math/mathcore/inc/Math/MinimTransformFunction.h
  114. index 59410da37e..99dce6c3c7 100644
  115. --- a/math/mathcore/inc/Math/MinimTransformFunction.h
  116. +++ b/math/mathcore/inc/Math/MinimTransformFunction.h
  117. @@ -12,23 +12,21 @@
  118.  // Header file for class MinimTransformFunction
  119.  
  120.  #ifndef ROOT_Math_MinimTransformFunction
  121.  #define ROOT_Math_MinimTransformFunction
  122.  
  123.  
  124.  #ifndef ROOT_Math_IFunction
  125.  #include "Math/IFunction.h"
  126.  #endif
  127.  
  128. -#ifndef ROOT_Math_MinimTransformVariable
  129.  #include "Math/MinimTransformVariable.h"
  130. -#endif
  131.  
  132.  
  133.  #include <vector>
  134.  #include <map>
  135.  
  136.  namespace ROOT {
  137.  
  138.     namespace Math {
  139.  
  140.  
  141. diff --git a/math/mathcore/src/MinimizerOptions.cxx b/math/mathcore/src/MinimizerOptions.cxx
  142. index 1c8faffa09..ef914b1f5f 100644
  143. --- a/math/mathcore/src/MinimizerOptions.cxx
  144. +++ b/math/mathcore/src/MinimizerOptions.cxx
  145. @@ -6,23 +6,21 @@
  146.   * Copyright (c) 2008  LCG ROOT Math Team, CERN/PH-SFT                *
  147.   *                                                                    *
  148.   *                                                                    *
  149.   **********************************************************************/
  150.  
  151.  #include "Math/MinimizerOptions.h"
  152.  
  153.  #include "Math/GenAlgoOptions.h"
  154.  
  155.  // case of using ROOT plug-in manager
  156. -#ifndef MATH_NO_PLUGIN_MANAGER
  157.  #include "TEnv.h"
  158. -#endif
  159.  
  160.  #include <iomanip>
  161.  
  162.  namespace ROOT {
  163.  
  164.  
  165.  namespace Math {
  166.  
  167.     namespace Minim {
  168.        static std::string gDefaultMinimizer = ""; // take from /etc/system.rootrc in ROOT Fitter
  169. diff --git a/math/mathmore/inc/Math/GSLNLSMinimizer.h b/math/mathmore/inc/Math/GSLNLSMinimizer.h
  170. index 5296f1942b..6844e309ea 100644
  171. --- a/math/mathmore/inc/Math/GSLNLSMinimizer.h
  172. +++ b/math/mathmore/inc/Math/GSLNLSMinimizer.h
  173. @@ -39,23 +39,21 @@
  174.  #endif
  175.  
  176.  #ifndef ROOT_Math_IParamFunctionfwd
  177.  #include "Math/IParamFunctionfwd.h"
  178.  #endif
  179.  
  180.  #ifndef ROOT_Math_FitMethodFunction
  181.  #include "Math/FitMethodFunction.h"
  182.  #endif
  183.  
  184. -#ifndef ROOT_Math_MinimTransformVariable
  185.  #include "Math/MinimTransformVariable.h"
  186. -#endif
  187.  
  188.  
  189.  #include <vector>
  190.  #include <map>
  191.  #include <string>
  192.  
  193.  namespace ROOT {
  194.  
  195.     namespace Math {
  196.  
  197. diff --git a/math/smatrix/inc/Math/SVector.h b/math/smatrix/inc/Math/SVector.h
  198. index 638e602bd7..19a467587b 100644
  199. --- a/math/smatrix/inc/Math/SVector.h
  200. +++ b/math/smatrix/inc/Math/SVector.h
  201. @@ -359,18 +359,16 @@ std::ostream& operator<<(std::ostream& os, const ROOT::Math::SVector<T,D>& rhs);
  202.  #include "Math/SVector.icc"
  203.  #endif
  204.  
  205.  // include operators and functions
  206.  #ifndef ROOT_Math_UnaryOperators
  207.  #include "Math/UnaryOperators.h"
  208.  #endif
  209.  #ifndef ROOT_Math_BinaryOperators
  210.  #include "Math/BinaryOperators.h"
  211.  #endif
  212. -#ifndef ROOT_Math_MatrixFunctions
  213.  #include "Math/Functions.h"
  214. -#endif
  215.  
  216.  #endif // __CINT__
  217.  
  218.  
  219.  #endif  /* ROOT_Math_SVector  */
  220. diff --git a/tmva/tmva/inc/TMVA/Envelope.h b/tmva/tmva/inc/TMVA/Envelope.h
  221. index ae6f663316..3b669a9e0d 100644
  222. --- a/tmva/tmva/inc/TMVA/Envelope.h
  223. +++ b/tmva/tmva/inc/TMVA/Envelope.h
  224. @@ -32,23 +32,21 @@
  225.  #endif
  226.  
  227.  #ifndef ROOT_TMVA_Tools
  228.  #include "TMVA/Tools.h"
  229.  #endif
  230.  
  231.  #ifndef ROOT_TMVA_DataLoader
  232.  #include "TMVA/DataLoader.h"
  233.  #endif
  234.  
  235. -#ifndef ROOT_TMVA_ROCCurve
  236.  #include "TMVA/DataLoader.h"
  237. -#endif
  238.  
  239.  
  240.  namespace TMVA {
  241.  
  242.        class Envelope:public Configurable
  243.        {
  244.        protected:
  245.            OptionMap                    fMethod;           //Booked method information
  246.            std::shared_ptr<DataLoader>  fDataLoader;       //data
  247.            std::shared_ptr<TFile>       fFile;             //!file to save the results
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!