Changeset 19351 for trunk/Mars/mdata

Timestamp:

11/07/18 11:22:15 (6 years ago)

Author:

tbretz

Message:

This fixed a problem with old gcc -- we might have to extend the range of the fix.

File:

• trunk/Mars/mdata/MDataMember.cc (modified) (1 diff)

trunk/Mars/mdata/MDataMember.cc

@@ -135 +135 @@
         return v;
 
-#if ROOT_VERSION_CODE < ROOT_VERSION(6,00,00)
-#define PARENT TMethodCall
-#else
-#define PARENT TInterpreter
-#endif
-
-
     default:
         *fLog << err << "ERROR - MDataMember::GetValue: " << fObject->GetName();
         *fLog << "." << fDataMember << " has unkown type (=";
-        *fLog << static_cast<underlying_type<PARENT::EReturnType>::type>(fCall->ReturnType()) << ")... returning 0." << endl;
+#if ROOT_VERSION_CODE < ROOT_VERSION(6,00,00) || (!defined(__clang__) && (__GNUC__ == 4) && (__GNUC_MINOR__ < 5))
+        *fLog << fCall->ReturnType() << ")... returning 0." << endl;
+#else
+
+        *fLog << static_cast<underlying_type<TInterpreter::EReturnType>::type>(fCall->ReturnType());
+#endif
+        *fLog << ")... returning 0." << endl;
         return 0;
     }