Changeset 18594 for trunk/Mars

Timestamp:

09/16/16 15:21:16 (8 years ago)

Author:

tbretz

Message:

It seems typedefs and templates need to be public with the newer compiler to work with the root dictionary (5.34/36) or it is the root version (uncritical)

Location:

trunk/Mars

Files:

• mcore/fits.h (modified) (2 diffs)
• mcore/zofits.h (modified) (2 diffs)
• mfileio/MWriteFitsFile.h (modified) (2 diffs)

trunk/Mars/mcore/fits.h

@@ -491 +491 @@
     }
 
+    // Public for the root dictionary
+    typedef std::pair<void*, Table::Column> Address;
+    typedef std::vector<Address> Addresses;
+    typedef std::unordered_map<std::string, void*> Pointers;
+
 protected:
     std::ofstream fCopy;
@@ -497 +502 @@
     Table fTable;
 
-    typedef std::pair<void*, Table::Column> Address;
-    typedef std::vector<Address> Addresses;
     //map<void*, Table::Column> fAddresses;
     Addresses fAddresses;
 
-    typedef std::unordered_map<std::string, void*> Pointers;
     Pointers fPointers;
 

trunk/Mars/mcore/zofits.h

@@ -988 +988 @@
         // data layout related stuff
         /// Regular columns augmented with compression informations
+
+    public: // Public for the root dictionary
         struct CompressedColumn
         {
@@ -999 +1001 @@
             FITS::Compression block_head;  ///< the compression data associated with that column
         };
+
+    protected:
         std::vector<CompressedColumn> fRealColumns;     ///< Vector hosting the columns of the file
         uint32_t                      fRealRowWidth;    ///< Width in bytes of one uncompressed row

trunk/Mars/mfileio/MWriteFitsFile.h

@@ -152 +152 @@
    void        SetupHeaderKeys(MRawRunHeader &header);
 
+public:
    //Header keys related stuff
    template<typename _T>
@@ -184 +185 @@
    }
 
-public:
    template<typename _T>
    bool SetHeaderKey(const std::string& key,