Changeset 20107 for trunk

Timestamp:

09/29/21 15:50:19 (3 years ago)

Author:

tbretz

Message:

Gcc doesn't like the pragma inside the enum.

File:

• trunk/Mars/mtools/MagicDomino.h (modified) (2 diffs)

trunk/Mars/mtools/MagicDomino.h

@@ -25 +25 @@
 {
 private:
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow"
     enum
     {
@@ -35 +38 @@
         kUserBits    = 0x7fc000, // 14-23 are allowed
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wshadow"
         kBottomLeft  = kBottom|kLeft,
         kBottomRight = kBottom|kRight,
         kTopLeft     = kTop|kLeft,
         kTopRight    = kTop|kRight
+    };
 #pragma GCC diagnostic pop
-
-    };
 
     MGeomCam *fGeomCam;         // pointer to camera geometry