Fix: Suppress -Wshadow warnings in headers on macOS (Fixes #20790)

core/base/inc/TApplication.h

@@ -1,3 +1,7 @@
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
 // @(#)root/base:$Id$
 // Author: Fons Rademakers   22/12/95
 
@@ -170,3 +174,7 @@ class TApplication : public TObject, public TQObject {
 R__EXTERN TApplication *gApplication;
 
 #endif
+
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif

core/base/inc/TAttMarker.h

@@ -1,3 +1,7 @@
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
 // @(#)root/base:$Id$
 // Author: Rene Brun   12/05/95
 
@@ -53,7 +57,14 @@ class TAttMarker {
    ClassDef(TAttMarker,3);  //Marker attributes
 };
 
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
    enum EMarkerStyle {kDot=1, kPlus, kStar, kCircle=4, kMultiply=5,
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
                       kFullDotSmall=6, kFullDotMedium=7, kFullDotLarge=8,
                       kFullCircle=20, kFullSquare=21, kFullTriangleUp=22,
                       kFullTriangleDown=23, kOpenCircle=24, kOpenSquare=25,
@@ -70,3 +81,6 @@ class TAttMarker {
 
 #endif
 
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif

core/base/inc/TSystem.h

@@ -1,3 +1,7 @@
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
 // @(#)root/base:$Id$
 // Author: Fons Rademakers   15/09/95
 
@@ -52,7 +56,14 @@ enum EAccessMode {
    kFileExists        = 0,
    kExecutePermission = 1,
    kWritePermission   = 2,
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
    kReadPermission    = 4
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
 };
 
 enum ELogOption {
@@ -574,3 +585,7 @@ R__EXTERN TFileHandler *gXDisplay;  // Display server (X11) input event handler
 
 
 #endif
+
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif

core/base/inc/TVirtualX.h

@@ -1,3 +1,7 @@
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
 // @(#)root/base:$Id$
 // Author: Fons Rademakers   3/12/95
 
@@ -339,3 +343,7 @@ R__EXTERN TVirtualX *(*gPtr2VirtualX)();
 R__EXTERN TVirtualX  *gGXBatch;
 
 #endif
+
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif

core/meta/inc/TClass.h

@@ -1,3 +1,7 @@
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
 // @(#)root/meta:$Id$
 // Author: Rene Brun   07/01/95
 
@@ -95,7 +99,14 @@ friend class TStreamerInfo;
    enum EStatusBits {
       kReservedLoading = BIT(7), // Internal status bits, set and reset only during initialization
 
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
       /* had kClassSaved  = BIT(12), */
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
       kHasLocalHashMember = BIT(14),
       kIgnoreTObjectStreamer = BIT(15),
       kUnloaded    = BIT(16), // The library containing the dictionary for this class was
@@ -693,3 +704,7 @@ template <typename T> TClass *GetClass(const T * /* dummy */) { return TClass::G
 }
 
 #endif // ROOT_TClass
+
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif

core/meta/inc/TInterpreter.h

@@ -1,3 +1,7 @@
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
 // @(#)root/meta:$Id$
 // Author: Fons Rademakers   01/03/96
 
@@ -70,7 +74,14 @@ class TInterpreter : public TNamed {
    typedef class std::map<std::string, std::string> MembersMap_t;
 
    enum EErrorCode {
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
       kNoError     = 0,
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
       kRecoverable = 1,
       kDangerous   = 2,
       kFatal       = 3,
@@ -584,3 +595,7 @@ inline ROOT::Internal::InterpreterMutexRegistrationRAII::~InterpreterMutexRegist
 }
 
 #endif
+
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif

gui/gui/inc/TGFrame.h

@@ -1,3 +1,7 @@
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
 // @(#)root/gui:$Id$
 // Author: Fons Rademakers   03/01/98
 
@@ -609,3 +613,7 @@ class TGHeaderFrame : public TGHorizontalFrame {
 
 
 #endif
+
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif

io/io/inc/TFile.h

@@ -1,3 +1,7 @@
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
 // @(#)root/io:$Id$
 // Author: Rene Brun   28/11/94
 
@@ -263,7 +267,14 @@ class TFile : public TDirectoryFile {
       // Note that to avoid a circular dependency, this value is used
       // hard coded in TObject.cxx.
       k630forwardCompatibility = BIT(2),
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
       kRecovered     = BIT(10),
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
       kHasReferences = BIT(11),
       kDevNull       = BIT(12),
       kWriteError    = BIT(14),
@@ -483,3 +494,7 @@ inline Int_t TFile::GetCompressionSettings() const
 }
 
 #endif
+
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif

math/matrix/inc/TMatrixT.h

@@ -1,3 +1,7 @@
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
 // @(#)root/matrix:$Id$
 // Authors: Fons Rademakers, Eddy Offermann   Nov 2003
 
@@ -56,7 +60,14 @@ template<class Element> class TMatrixT : public TMatrixTBase<Element> {
 
 
    enum {kWorkMax = 100};
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
    enum EMatrixCreatorsOp1 { kZero,kUnit,kTransposed,kInverted,kAtA };
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
    enum EMatrixCreatorsOp2 { kMult,kTransposeMult,kInvMult,kMultTranspose,kPlus,kMinus };
 
    TMatrixT(): fDataStack(), fElements(nullptr) { }
@@ -364,3 +375,7 @@ template <class Element> void AMultBt(const Element * const ap,Int_t na,Int_t nc
                                       const Element * const bp,Int_t nb,Int_t ncolsb,Element *cp);
 } // inline namespace TMatrixTAutoloadOps
 #endif
+
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif

math/matrix/inc/TMatrixTSparse.h

@@ -1,3 +1,7 @@
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
 // @(#)root/matrix:$Id$
 // Authors: Fons Rademakers, Eddy Offermann   Feb 2004
 
@@ -77,7 +81,14 @@ template<class Element> class TMatrixTSparse : public TMatrixTBase<Element> {
 
 public:
 
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
    enum EMatrixCreatorsOp1 { kZero,kUnit,kTransposed,kAtA };
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
    enum EMatrixCreatorsOp2 { kMult,kMultTranspose,kPlus,kMinus };
 
    TMatrixTSparse() { fElements = nullptr; fRowIndex = nullptr; fColIndex = nullptr; }
@@ -285,3 +296,7 @@ template <class Element> TMatrixTSparse<Element> &ElementDiv (TMatrixTSparse<Ele
 template <class Element> Bool_t AreCompatible(const TMatrixTSparse<Element> &m1,const TMatrixTSparse<Element> &m2,Int_t verbose=0);
 
 #endif
+
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif

math/matrix/inc/TMatrixTSym.h

@@ -1,3 +1,7 @@
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
 // @(#)root/matrix:$Id$
 // Authors: Fons Rademakers, Eddy Offermann   Nov 2003
 
@@ -50,7 +54,14 @@ template<class Element> class TMatrixTSym : public TMatrixTBase<Element> {
 public:
 
    enum {kWorkMax = 100}; // size of work array
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
    enum EMatrixCreatorsOp1 { kZero,kUnit,kTransposed,kInverted,kAtA };
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
    enum EMatrixCreatorsOp2 { kPlus,kMinus };
 
    TMatrixTSym() { fElements = nullptr; }
@@ -283,3 +294,7 @@ template <class Element> TMatrixTSym<Element> &ElementMult(TMatrixTSym<Element>
 template <class Element> TMatrixTSym<Element> &ElementDiv (TMatrixTSym<Element> &target,const TMatrixTSym<Element> &source);
 
 #endif
+
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif

net/net/inc/TSocket.h

@@ -1,3 +1,7 @@
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
 // @(#)root/net:$Id$
 // Author: Fons Rademakers   18/12/96
 
@@ -188,3 +192,7 @@ inline Int_t TSocket::GetCompressionSettings() const
 }
 
 #endif
+
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif

tree/tree/inc/TBranch.h

@@ -1,3 +1,7 @@
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
 // @(#)root/tree:$Id$
 // Author: Rene Brun   12/01/96
 
@@ -56,7 +60,14 @@ class TBranchIMTHelper; ///< A helper class for managing IMT work during TTree:F
 const Int_t kDoNotProcess = BIT(10); // Active bit for branches
 const Int_t kIsClone      = BIT(11); // to indicate a TBranchClones
 const Int_t kBranchObject = BIT(12); // branch is a TObject*
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
 const Int_t kBranchAny    = BIT(17); // branch is an object*
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
 const Int_t kMapObject    = kBranchObject | kBranchAny;
 
 namespace ROOT {
@@ -328,3 +339,7 @@ inline bool   TBulkBranchRead::SupportsBulkRead() const { return fParent.Support
 }  // ROOT
 
 #endif
+
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif