Changeset 20095 for trunk


Ignore:
Timestamp:
05/07/21 12:35:29 (4 years ago)
Author:
tbretz
Message:
Oh great master of the root universe, thanks for you namepace polution.
Location:
trunk/Mars
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/Mars/manalysis/MMatrixLoop.h

    r6924 r20095  
    1111{
    1212public:
     13#pragma GCC diagnostic push
     14#pragma GCC diagnostic ignored "-Wshadow"
    1315    enum OperationMode_t {
    1416        kDefault,
    … …  
    1618        kOdd
    1719    };
     20#pragma GCC diagnostic pop
     21
    1822private:
    1923    // MMatrixLoop

  • trunk/Mars/mastro/MVector3.h

    r14447 r20095  
    44#ifndef ROOT_TVector3
    55#include <TVector3.h>
     6#endif
     7
     8#ifndef ROOT_TString
     9#include <TString.h> // root 6.24
    610#endif
    711

  • trunk/Mars/mbase/MLog.h

    r14443 r20095  
    4040    };
    4141
     42#pragma GCC diagnostic push
     43#pragma GCC diagnostic ignored "-Wshadow"
    4244    enum ELogType {
    4345        kDefault,
    … …  
    4547        kBlackWhite
    4648    };
     49#pragma GCC diagnostic pop
    4750
    4851private:

  • trunk/Mars/mcalib/MCalibrateData.h

    r14449 r20095  
    2424{
    2525public:
     26#pragma GCC diagnostic push
     27#pragma GCC diagnostic ignored "-Wshadow"
    2628    enum CalibrationMode_t
    2729    {
    … …  
    3537        kDummy      =  7
    3638    };
     39#pragma GCC diagnostic pop
    3740
    3841    enum PedestalType_t

  • trunk/Mars/mextralgo/MExtralgoSpline.h

    r17879 r20095  
    55#include <TMath.h>
    66#endif
     7#ifndef ROOT_TObject
     8#include <TObject.h> // root 6.24
     9#endif
    710
    811class MArrayF;
    … …  
    1215{
    1316private:
     17#pragma GCC diagnostic push
     18#pragma GCC diagnostic ignored "-Wshadow"
    1419    enum
    1520    {
    … …  
    2025        kFixedWidth = BIT(4),
    2126    };
     27#pragma GCC diagnostic pop
    2228public: 
    2329    enum ExtractionType_t

  • trunk/Mars/mfilter/MFMagicCuts.h

    r9338 r20095  
    2424{
    2525public:
     26#pragma GCC diagnostic push
     27#pragma GCC diagnostic ignored "-Wshadow"
    2628    // Possible kind of theta cuts
    2729    enum ThetaCut_t {
    … …  
    3133        kWobble=kOn|kOff
    3234    };
     35#pragma GCC diagnostic pop
     36
    3337    // Possible kind of hadronness cuts
    3438    enum HadronnessCut_t {

  • trunk/Mars/mhbase/MBinning.h

    r14447 r20095  
    2929    void StreamPrimitive(std::ostream &out) const;
    3030
     31#pragma GCC diagnostic push
     32#pragma GCC diagnostic ignored "-Wshadow"
    3133    enum {
    3234        kIsDefault,
    … …  
    3638        kIsUserArray
    3739    };
     40#pragma GCC diagnostic pop
    3841
    3942public:

  • trunk/Mars/mhflux/MAlphaFitter.h

    r15446 r20095  
    1717{
    1818public:
     19#pragma GCC diagnostic push
     20#pragma GCC diagnostic ignored "-Wshadow"
    1921    enum ScaleMode_t {
    2022        kNone,         // No scaling
    … …  
    2628        kUserScale     // scale by fixed factor set by SetScaleUser
    2729    };
     30#pragma GCC diagnostic pop
    2831    enum Strategy_t {
    2932        kSignificance,

  • trunk/Mars/mhist/MHCamera.h

    r15258 r20095  
    220220    void     SetLevels(const TArrayF &arr);
    221221
    222     void     FillRandom(const char *fname, Int_t ntimes=5000) { TH1::FillRandom(fname, ntimes); }
    223     void     FillRandom(TH1 *h, Int_t ntimes=5000) { TH1::FillRandom(h, ntimes); }
     222    using TH1D::FillRandom;
     223
    224224    void     FillRandom();
    225225

  • trunk/Mars/mpointing/MSrcPosCalc.h

    r9613 r20095  
    2525{
    2626public:
     27#pragma GCC diagnostic push
     28#pragma GCC diagnostic ignored "-Wshadow"
    2729    enum Mode_t {
    2830        kDefault = 0,   // Set source position to on-position
    … …  
    3133        kFixed   = 3    // Set source position to predefined fFixedPos
    3234    };
     35#pragma GCC diagnostic pop
    3336private:
    3437    enum {

  • trunk/Mars/mtools/MagicDomino.h

    r9369 r20095  
    3535        kUserBits    = 0x7fc000, // 14-23 are allowed
    3636
     37#pragma GCC diagnostic push
     38#pragma GCC diagnostic ignored "-Wshadow"
    3739        kBottomLeft  = kBottom|kLeft,
    3840        kBottomRight = kBottom|kRight,
    3941        kTopLeft     = kTop|kLeft,
    4042        kTopRight    = kTop|kRight
     43#pragma GCC diagnostic pop
    4144
    4245    };
Note: See TracChangeset for help on using the changeset viewer.