Changeset 19255


Ignore:
Timestamp:
Oct 22, 2018, 6:43:00 PM (10 months ago)
Author:
tbretz
Message:
Some precompiler macros turned into enums in root 6.
Location:
trunk/Mars/mfileio
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Mars/mfileio/MFitsArray.cc

    r14869 r19255  
    9292         continue;
    9393
     94#if ROOT_VERSION_CODE < ROOT_VERSION(6,00,00)
    9495      if (dataMember->Property() & ( G__BIT_ISENUM | G__BIT_ISSTATIC))
    9596         continue;
    96 
     97#else
     98      if (dataMember->Property() & ( EProperty::kIsEnum | EProperty::kIsStatic))
     99         continue;
     100#endif
    97101      if (strcmp(dataMember->GetTrueTypeName(), "TClass*") == 0)
    98102         continue;
  • trunk/Mars/mfileio/MWriteFitsFile.cc

    r18957 r19255  
    783783         continue;
    784784
     785#if ROOT_VERSION_CODE < ROOT_VERSION(6,00,00)
    785786      if (dataMember->Property() & ( G__BIT_ISENUM | G__BIT_ISSTATIC))
    786787         // we cannot store this
    787788         continue;
     789#else
     790      if (dataMember->Property() & ( EProperty::kIsEnum | kIsStatic))
     791         // we cannot store this
     792         continue;
     793#endif
    788794
    789795      if (strcmp(dataMember->GetTrueTypeName(), "TClass*") == 0)
     
    889895//          continue;
    890896
     897#if ROOT_VERSION_CODE < ROOT_VERSION(6,00,00)
    891898      if (dataMember->Property() & G__BIT_ISCLASS)
     899#else
     900      if (dataMember->Property() & EProperty::kIsClass)
     901#endif
    892902         {
    893903         // special treatment for classes
Note: See TracChangeset for help on using the changeset viewer.