Changeset 19257 for trunk

Timestamp:

10/22/18 19:00:24 (6 years ago)

Author:

tbretz

Message:

Compatibility with root 6 -- more C++ like in general.

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 << fCall->ReturnType() << ")... returning 0." << endl;
+        *fLog << static_cast<underlying_type<PARENT::EReturnType>::type>(fCall->ReturnType()) << ")... returning 0." << endl;
         return 0;
     }