silence enum -Wshadow warnings by clang

core/base/inc/TAttMarker.h

@@ -53,7 +53,25 @@ class TAttMarker {
    ClassDef(TAttMarker,3);  //Marker attributes
 };
 
-   enum EMarkerStyle {kDot=1, kPlus, kStar, kCircle=4, kMultiply=5,
+   enum EMarkerStyle {kDot=1,
+// clang++ (-Wshadow) complains about shadowing TMatrixT::EMatrixCreatorsOp2 or TParameter::EStatusBits. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+                      kPlus,
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+                      kStar, kCircle=4,
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+                      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,

core/base/inc/TBuffer3D.h

@@ -46,7 +46,16 @@ class TBuffer3D : public TObject
    static void IncCSLevel();
    static UInt_t DecCSLevel();
 
-   enum ESection { kNone            = BIT(0),
+   enum ESection {
+// clang++ (-Wshadow) complains about shadowing GuiTypes.h kNone. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+                   kNone            = BIT(0),
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
                    kCore            = BIT(1),
                    kBoundingBox     = BIT(2),
                    kShapeSpecific   = BIT(3),

core/base/inc/TBuffer3DTypes.h

@@ -23,8 +23,16 @@ class TBuffer3DTypes {
                             //                     g3d              geom
    enum EType { kGeneric,   // TBuffer3D           Rest             Rest
                 kComposite, // TBuffer3D                            TGetCompositeShape
+// clang++ (-Wshadow) complains about shadowing Buttons.h EEditMode. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
                 kLine,      // TBuffer3D           TPolyLine3D
                 kMarker,    // TBuffer3D           TPolyMarker3D
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
                 kSphere,    // TBuffer3DSphere     TSPHE            TGeoSphere
                 kTube,      // TBuffer3DTube                        TGeoTube
                 kTubeSeg,   // TBuffer3DTubeSeg                     TGeoTubeSeg

core/base/inc/TMemberInspector.h

@@ -31,7 +31,15 @@ class TClass;
 class TMemberInspector {
 public:
    enum EObjectPointerState {
+// clang++ (-Wshadow) complains about shadowing TError.h kUnset. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
       kUnset, // No Inspect() call has been seen yet.
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
       kNoObjectGiven, // No object was given to the initial Inspect() call.
       kValidObjectGiven // The address points to an actual object.
    };

core/base/inc/TParameter.h

@@ -36,12 +36,21 @@ class TParameter : public TObject {
 
 public:
    // Defines options / status while merging:
-   enum EStatusBits { kMultiply   = BIT(16),    // Use multiplication
-                      kMax        = BIT(17),    // Take max value
-                      kMin        = BIT(18),    // Take min value
-                      kFirst      = BIT(19),    // Take the first value
-                      kLast       = BIT(20),    // Take the last value
-                      kIsConst    = BIT(21)     // Set if all values are equal
+   enum EStatusBits {
+// clang++ (-Wshadow) complains about shadowing TMatrixT::EMatrixCreatorsOp2. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+      kMultiply   = BIT(16),    // Use multiplication
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+      kMax        = BIT(17),    // Take max value
+      kMin        = BIT(18),    // Take min value
+      kFirst      = BIT(19),    // Take the first value
+      kLast       = BIT(20),    // Take the last value
+      kIsConst    = BIT(21)     // Set if all values are equal
    };
 
 private:

core/base/inc/TSystem.h

@@ -84,7 +84,15 @@ enum ELogFacility {
 
 enum EFpeMask {
    kNoneMask         = 0x00,
+// clang++ (-Wshadow) complains about shadowing TSocket::ESocketErrors. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
    kInvalid          = 0x01,  // Invalid argument
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
    kDivByZero        = 0x02,  // Division by zero
    kOverflow         = 0x04,  // Overflow
    kUnderflow        = 0x08,  // Underflow
@@ -240,7 +248,15 @@ enum ESockOptions {
 };
 
 enum ESendRecvOptions {
+// clang++ (-Wshadow) complains about shadowing EAclicMode::kDefault. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
    kDefault,           // default option (= 0)
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
    kOob,               // send or receive out-of-band data
    kPeek,              // peek at incoming message (receive only)
    kDontBlock          // send/recv as much data as possible without blocking
@@ -276,7 +292,17 @@ class TProcessEventTimer : public TTimer {
 class TSystem : public TNamed {
 
 public:
-   enum EAclicMode { kDefault, kDebug, kOpt };
+   enum EAclicMode {
+// clang++ (-Wshadow) complains about shadowing ESendRecvOptions::kDefault. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+      kDefault,
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+      kDebug, kOpt };
    enum EAclicProperties {
       kFlatBuildDir = BIT(0)           // If set and a BuildDir is selected, then do not created sub-directories
    };

core/base/inc/TVirtualPadPainter.h

@@ -19,7 +19,17 @@ class TVirtualPad;
 class TVirtualPadPainter {
 public:
    enum EBoxMode  {kHollow, kFilled};
-   enum ETextMode {kClear,  kOpaque};
+   enum ETextMode {
+// clang++ (-Wshadow) complains about shadowing Getline.h EGetLineMode. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+      kClear,
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+      kOpaque};
 
    virtual ~TVirtualPadPainter();
 

core/meta/inc/TEnum.h

@@ -46,7 +46,16 @@ class TEnum : public TDictionary {
 
 public:
 
-   enum ESearchAction {kNone                 = 0,
+   enum ESearchAction {
+// clang++ (-Wshadow) complains about shadowing GuiTypes.h kNone. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+                       kNone                 = 0,
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
                        kAutoload             = 1,
                        kInterpLookup         = 2,
                        kALoadAndInterpLookup = 3

core/meta/inc/TProtoClass.h

@@ -47,7 +47,15 @@ class TProtoClass: public TNamed {
       enum EStatusFlags {
          kIsObject    = BIT(0),    // member is object
          kIsTransient = BIT(1),    // data member is transient
+// clang++ (-Wshadow) complains about shadowing TDictionary::EProperty. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
          kIsPointer   = BIT(2),    // data member is a pointer
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
          kBitMask     = 0x000000ff
       };
 

core/meta/inc/TVirtualStreamerInfo.h

@@ -74,7 +74,15 @@ class TVirtualStreamerInfo : public TNamed {
       kIgnoreTObjectStreamer = BIT(13),  // eventhough BIT(13) is taken up by TObject (to preserve forward compatibility)
       kRecovered             = BIT(14),
       kNeedCheck             = BIT(15),
+// clang++ (-Wshadow) complains about shadowing TDictionary::EProperty. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
       kIsCompiled            = BIT(16),
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
       kBuildOldUsed          = BIT(17),
       kBuildRunning          = BIT(18)
    };
@@ -114,11 +122,29 @@ class TVirtualStreamerInfo : public TNamed {
    /// | kUnsupportedConversion | The member type onfile and in memory can not be converted |
    /// | kUnset      | default value |
    enum EReadWrite {
-      kBase        =  0,  kOffsetL = 20,  kOffsetP = 40,  kCounter =  6,  kCharStar = 7,
+      kBase        =  0,  kOffsetL = 20,  kOffsetP = 40,
       kChar        =  1,  kShort   =  2,  kInt     =  3,  kLong    =  4,  kFloat    = 5,
+// clang++ (-Wshadow) complains about shadowing TDataType::EDataType. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+      kCounter =  6, kCharStar = 7,
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
       kDouble      =  8,  kDouble32=  9,
       kLegacyChar  = 10, /// Equal to TDataType's kchar
-      kUChar       = 11,  kUShort  = 12,  kUInt    = 13,  kULong   = 14,  kBits     = 15,
+      kUChar       = 11,  kUShort  = 12,  kUInt    = 13,  kULong   = 14,
+// clang++ (-Wshadow) complains about shadowing TDataType::EDataType. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+      kBits     = 15,
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
       kLong64      = 16,  kULong64 = 17,  kBool    = 18,  kFloat16 = 19,
       kObject      = 61,  kAny     = 62,  kObjectp = 63,  kObjectP = 64,  kTString  = 65,
       kTObject     = 66,  kTNamed  = 67,  kAnyp    = 68,  kAnyP    = 69,  kAnyPnoVT = 70,
@@ -136,7 +162,15 @@ class TVirtualStreamerInfo : public TNamed {
       kMissing     = 99999,
       kNoType      = -1,   /// Type corresponding to a 'missing' data member (with kMissing offset)
       kUnsupportedConversion = -2,
+// clang++ (-Wshadow) complains about shadowing Terror.h kUnset. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
       kUnset       = -3
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
    };
    // clang-format off
 

graf2d/gpad/inc/TControlBarButton.h

@@ -21,7 +21,17 @@ class TControlBarButton : public TNamed {
    TString  fAction;     ///< action to be executed
 
 public:
-   enum { kButton = 1, kDrawnButton, kSeparator };
+   enum {
+// clang++ (-Wshadow) complains about shadowing Buttons.h EEditMode. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+      kButton = 1,
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+      kDrawnButton, kSeparator };
 
    TControlBarButton();
    TControlBarButton(const char *label, const char *action="", const char *hint="", const char *type="button");

graf2d/graf/inc/TCandle.h

@@ -29,7 +29,15 @@ class TCandle : public TAttLine, public TAttFill, public TAttMarker {
    //Candle Option
    enum CandleOption: long {
       kNoOption           = 0,
+// clang++ (-Wshadow) complains about shadowing Buttons.h EEditMode. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
       kBox                = 1,
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
       kMedianLine         = 10,
       kMedianNotched      = 20,
       kMedianCircle       = 30,

graf2d/x11ttf/inc/TGX11TTF.h

@@ -27,8 +27,19 @@ class TXftFontHash;
 class TGX11TTF : public TGX11 {
 
 private:
-   enum EAlign { kNone, kTLeft, kTCenter, kTRight, kMLeft, kMCenter, kMRight,
-                        kBLeft, kBCenter, kBRight };
+   enum EAlign {
+// clang++ (-Wshadow) complains about shadowing GuiTypes.h kNone. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+      kNone,
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+
+      kTLeft, kTCenter, kTRight, kMLeft, kMCenter, kMRight,
+      kBLeft, kBCenter, kBRight };
 
    FT_Vector   fAlign;                 ///< alignment vector
 #ifdef R__HAS_XFT

graf3d/eve/inc/TEveCalo.h

@@ -255,7 +255,17 @@ class TEveCaloLego : public TEveCaloViz
 public:
    enum EProjection_e { kAuto, k3D, k2D };
    enum E2DMode_e     { kValColor, kValSize, kValSizeOutline };
-   enum EBoxMode_e    { kNone, kFrontBack, kBack};
+   enum EBoxMode_e    {
+// clang++ (-Wshadow) complains about shadowing GuiTypes.h kNone. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+      kNone,
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+      kFrontBack, kBack};
 
 private:
    TEveCaloLego(const TEveCaloLego&) = delete;

graf3d/eve/inc/TEveElement.h

@@ -327,7 +327,15 @@ class TEveElement
 
    enum EDestruct
    {
+// clang++ (-Wshadow) complains about shadowing GuiTypes.h kNone. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
       kNone,
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
       kStandard,
       kAnnihilate
    };

graf3d/gl/inc/TGLAnnotation.h

@@ -29,7 +29,25 @@ class TGLAnnotation : public TGLOverlayElement
    TGLAnnotation& operator=(const TGLAnnotation&) = delete;
 
 protected:
-   enum EDrag        { kMove, kResize, kNone };
+   enum EDrag        {
+// clang++ (-Wshadow) complains about shadowing GuiTypes.h ECursor or kNone. Let's silence warning:
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+      kMove,
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+      kResize,
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+      kNone };
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
    enum ENameStack   { kMoveID, kEditID, kDeleteID, kResizeID };
 
    void MakeEditor();