Changeset 19829 for trunk/Mars/mcore

Timestamp:

10/30/19 14:29:43 (5 years ago)

Author:

tbretz

Message:

There is a problem with the rootcint hack with root v6. I hope that fixes it.

File:

• trunk/Mars/mcore/fits.h (modified) (2 diffs)

trunk/Mars/mcore/fits.h

@@ -26 +26 @@
 #endif
 
-#if defined(__MARS__) || defined(__CINT__) || defined(__CLING__)
+// ROOT_VERSION is not defined in ROOTv5, but special treatment is
+// needed depending on whether this is to create the disctionary or not
+// For ROOTv6 now either __CLING__ (dirctionary) or __ROOTv6__ (compiler)
+// should be defined.
+#if defined(ROOT_VERSION_CODE)
+#if ROOT_VERSION_CODE >= ROOT_VERSION(6,00,0)
+#define __ROOTv6__ 1
+#endif
+#endif
+
+#if defined(__MARS__) || defined(__CINT__) || defined (__CLING__) || defined (__ROOTv6__)
 #include "MLog.h"
 #include "MLogManip.h"
@@ -44 +54 @@
 #endif
 
-#if defined(HAVE_ZLIB) || defined(__CINT__) || defined(__CLING__)
+#if defined(HAVE_ZLIB) || defined(__CINT__) || defined(__CLING__) || defined (__ROOTv6__)
 #include "izstream.h"
 #else