Changeset 20107 for trunk/Mars


Ignore:
Timestamp:
09/29/21 15:50:19 (3 years ago)
Author:
tbretz
Message:
Gcc doesn't like the pragma inside the enum.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Mars/mtools/MagicDomino.h

    r20095 r20107  
    2525{
    2626private:
     27
     28#pragma GCC diagnostic push
     29#pragma GCC diagnostic ignored "-Wshadow"
    2730    enum
    2831    {
     
    3538        kUserBits    = 0x7fc000, // 14-23 are allowed
    3639
    37 #pragma GCC diagnostic push
    38 #pragma GCC diagnostic ignored "-Wshadow"
    3940        kBottomLeft  = kBottom|kLeft,
    4041        kBottomRight = kBottom|kRight,
    4142        kTopLeft     = kTop|kLeft,
    4243        kTopRight    = kTop|kRight
     44    };
    4345#pragma GCC diagnostic pop
    44 
    45     };
    4646
    4747    MGeomCam *fGeomCam;         // pointer to camera geometry
Note: See TracChangeset for help on using the changeset viewer.