Changeset 17304 for trunk/Mars/mcore/factofits.h

Timestamp:

10/22/13 10:24:02 (11 years ago)

Author:

lyard

Message:

Adapted compilation on older Gcc

File:

• trunk/Mars/mcore/factofits.h (modified) (4 diffs)

trunk/Mars/mcore/factofits.h

@@ -8 +8 @@
 #ifndef FACTOFITS_H_
 #define FACTOFITS_H_
+
+#define GCC_VERSION (__GNUC__ * 10000  + __GNUC_MINOR__ * 100  + __GNUC_PATCHLEVEL__)
 
 #include "zofits.h"
@@ -235 +237 @@
             Checksum rawsum;
             rawsum.add((char*)(fOffsetCalibration.data()), 1024*1440*sizeof(int16_t));
+#if GCC_VERSION < 40603
+            c.SetStr("RAWSUM", std::to_string((long long unsigned int)(rawsum.val())));
+#else
             c.SetStr("RAWSUM", std::to_string(rawsum.val()));
+#endif
 
             //compress data and calculate final, compressed size
@@ -245 +251 @@
 
             //Write tile header
-            FITS::TileHeader th;
+            FITS::TileHeader th(0, 0);
             std::vector<uint16_t> seq(1, FITS::kFactHuffman16);
             FITS::Compression bh(seq, FITS::kOrderByRow);
@@ -275 +281 @@
             c.SetFloat("ZRATIO", (float)(1024*1440*2)/(float)(compressed_size));
             c.SetInt("PCOUNT", compressed_size + catalog_size);
+
+#if GCC_VERSION < 40603
+            c.SetStr("DATASUM", std::to_string((long long unsigned int)(datasum.val())));
+#else
             c.SetStr("DATASUM", std::to_string(datasum.val()));
+#endif
 
             datasum += c.WriteHeader(*this);