Changeset 15267 for trunk/Mars

Timestamp:

04/06/13 13:01:45 (11 years ago)

Author:

tbretz

Message:

It seems there is a problem with the defines used by CINT in AcLiC and there seems to be a problem with NameMangling. Having GetRow overloaded does not seem to work. It needs a different name seen by root.

File:

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

trunk/Mars/mcore/fits.h

@@ -26 +26 @@
 #ifdef __CINT__
 #define off_t size_t
-#else
+#endif
+
+#if !defined(__MARS__) && !defined(__CINT__)
 #include <unordered_map>
 #endif
@@ -46 +48 @@
 #endif
 
-#ifdef HAVE_ZLIB
+#if defined(HAVE_ZLIB) || defined(__CINT__)
 #include "izstream.h"
 #else
@@ -425 +427 @@
     Addresses fAddresses;
 
-#ifdef __MARS__
+#if defined(__MARS__) || defined(__CINT__)
     typedef map<string, void*> Pointers;
 #else
@@ -638 +640 @@
     }
 
+#if !defined(__MARS__) && !defined(__CINT__)
     bool GetRow(size_t row, bool check=true)
+#else
+    bool GetRowNum(size_t row, bool check=true)
+#endif
     {
         if (check && row>=fTable.num_rows)
@@ -657 +663 @@
 
             // Let the compiler do some optimization by
-            // knowing the we only have 1, 2, 4 and 8
+            // knowing that we only have 1, 2, 4 and 8
             switch (c.size)
             {
@@ -672 +678 @@
     bool GetNextRow(bool check=true)
     {
+#if !defined(__MARS__) && !defined(__CINT__)
         return GetRow(fRow+1, check);
+#else
+        return GetRowNum(fRow+1, check);
+#endif
     }