Changeset 19351


Ignore:
Timestamp:
Nov 7, 2018, 11:22:15 AM (7 months ago)
Author:
tbretz
Message:
This fixed a problem with old gcc -- we might have to extend the range of the fix.
File:
1 edited

Legend:

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

    r19257 r19351  
    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 
    144137    default:
    145138        *fLog << err << "ERROR - MDataMember::GetValue: " << fObject->GetName();
    146139        *fLog << "." << fDataMember << " has unkown type (=";
    147         *fLog << static_cast<underlying_type<PARENT::EReturnType>::type>(fCall->ReturnType()) << ")... returning 0." << endl;
     140#if ROOT_VERSION_CODE < ROOT_VERSION(6,00,00) || (!defined(__clang__) && (__GNUC__ == 4) && (__GNUC_MINOR__ < 5))
     141        *fLog << fCall->ReturnType() << ")... returning 0." << endl;
     142#else
     143
     144        *fLog << static_cast<underlying_type<TInterpreter::EReturnType>::type>(fCall->ReturnType());
     145#endif
     146        *fLog << ")... returning 0." << endl;
    148147        return 0;
    149148    }
Note: See TracChangeset for help on using the changeset viewer.