Changeset 17297

Timestamp:

10/21/13 14:15:50 (11 years ago)

Author:

tbretz

Message:

Added some more tweaks needed by CINT (default constructors, handling of __attribute((__packed__)))

Location:

trunk/Mars/mcore

Files:

• FITS.h (modified) (2 diffs)
• Queue.h (modified) (1 diff)
• zofits.h (modified) (4 diffs)

trunk/Mars/mcore/FITS.h

@@ -32 +32 @@
     };
 
+#ifdef __CINT__
+    struct TileHeader;
+    struct BlockHeader;
+#else
     //Structure helper for tiles headers
     struct TileHeader
@@ -63 +67 @@
         {}
     } __attribute__((__packed__));
+#endif
 
     //Helper structure to simplify the initialization and handling of compressed blocks headers

trunk/Mars/mcore/Queue.h

@@ -140 +140 @@
     }
 
+#ifdef __MARS__ // Needed for the compilatio of the dictionary
+    Queue() : fSize(0), fState(kIdle)
+    {
+    }
+#endif
+
     ~Queue()
     {

trunk/Mars/mcore/zofits.h

@@ -20 +20 @@
 class zofits : public ofits
 {
+#ifdef __MARS__ // Needed by CINT to access the structures
+public:
+#endif
         /// Overriding of the begin() operator to get the smallest item in the list instead of the true begin
         template<class S>
@@ -30 +33 @@
         };
 
-
+#ifdef __CINT__
+        struct CatalogEntry;
+#else
         //catalog types
         struct CatalogEntry
@@ -38 +43 @@
             int64_t second;  ///< offset of this column in the tile, from the start of the heap area
         } __attribute__((__packed__));
+#endif
 
         typedef std::vector<CatalogEntry> CatalogRow;
         typedef std::list<CatalogRow>     CatalogType;
-
 
         /// Parameters required to write a tile to disk
@@ -952 +957 @@
                 block_head(h)
             {}
+#ifdef __MARS__ // Needed for the compilation ofthe dictionary
+            CompressedColumn() { }
+#endif
             Table::Column col;             ///< the regular column entry
             FITS::Compression block_head;  ///< the compression data associated with that column