Changeset 19255 for trunk/Mars/mfileio

Timestamp:

10/22/18 18:43:00 (6 years ago)

Author:

tbretz

Message:

Some precompiler macros turned into enums in root 6.

Location:

trunk/Mars/mfileio

Files:

• MFitsArray.cc (modified) (1 diff)
• MWriteFitsFile.cc (modified) (2 diffs)

trunk/Mars/mfileio/MFitsArray.cc

@@ -92 +92 @@
          continue;
 
+#if ROOT_VERSION_CODE < ROOT_VERSION(6,00,00)
       if (dataMember->Property() & ( G__BIT_ISENUM | G__BIT_ISSTATIC))
          continue;
-
+#else
+      if (dataMember->Property() & ( EProperty::kIsEnum | EProperty::kIsStatic))
+         continue;
+#endif
       if (strcmp(dataMember->GetTrueTypeName(), "TClass*") == 0)
          continue;

trunk/Mars/mfileio/MWriteFitsFile.cc

@@ -783 +783 @@
          continue;
 
+#if ROOT_VERSION_CODE < ROOT_VERSION(6,00,00)
       if (dataMember->Property() & ( G__BIT_ISENUM | G__BIT_ISSTATIC))
          // we cannot store this
          continue;
+#else
+      if (dataMember->Property() & ( EProperty::kIsEnum | kIsStatic))
+         // we cannot store this
+         continue;
+#endif
 
       if (strcmp(dataMember->GetTrueTypeName(), "TClass*") == 0)
@@ -889 +895 @@
 //          continue;
 
+#if ROOT_VERSION_CODE < ROOT_VERSION(6,00,00)
       if (dataMember->Property() & G__BIT_ISCLASS)
+#else
+      if (dataMember->Property() & EProperty::kIsClass)
+#endif
          {
          // special treatment for classes