Changeset 19257


Ignore:
Timestamp:
Oct 22, 2018, 7:00:24 PM (10 months ago)
Author:
tbretz
Message:
Compatibility with root 6 -- more C++ like in general.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Mars/mdata/MDataMember.cc

    r9036 r19257  
    135135        return v;
    136136
     137#if ROOT_VERSION_CODE < ROOT_VERSION(6,00,00)
     138#define PARENT TMethodCall
     139#else
     140#define PARENT TInterpreter
     141#endif
     142
     143
    137144    default:
    138145        *fLog << err << "ERROR - MDataMember::GetValue: " << fObject->GetName();
    139146        *fLog << "." << fDataMember << " has unkown type (=";
    140         *fLog << fCall->ReturnType() << ")... returning 0." << endl;
     147        *fLog << static_cast<underlying_type<PARENT::EReturnType>::type>(fCall->ReturnType()) << ")... returning 0." << endl;
    141148        return 0;
    142149    }
Note: See TracChangeset for help on using the changeset viewer.