Changeset 18594


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Mars/mcore/fits.h

    r18049 r18594  
    491491    }
    492492
     493    // Public for the root dictionary
     494    typedef std::pair<void*, Table::Column> Address;
     495    typedef std::vector<Address> Addresses;
     496    typedef std::unordered_map<std::string, void*> Pointers;
     497
    493498protected:
    494499    std::ofstream fCopy;
     
    497502    Table fTable;
    498503
    499     typedef std::pair<void*, Table::Column> Address;
    500     typedef std::vector<Address> Addresses;
    501504    //map<void*, Table::Column> fAddresses;
    502505    Addresses fAddresses;
    503506
    504     typedef std::unordered_map<std::string, void*> Pointers;
    505507    Pointers fPointers;
    506508
  • trunk/Mars/mcore/zofits.h

    r17779 r18594  
    988988        // data layout related stuff
    989989        /// Regular columns augmented with compression informations
     990
     991    public: // Public for the root dictionary
    990992        struct CompressedColumn
    991993        {
     
    9991001            FITS::Compression block_head;  ///< the compression data associated with that column
    10001002        };
     1003
     1004    protected:
    10011005        std::vector<CompressedColumn> fRealColumns;     ///< Vector hosting the columns of the file
    10021006        uint32_t                      fRealRowWidth;    ///< Width in bytes of one uncompressed row
  • trunk/Mars/mfileio/MWriteFitsFile.h

    r17868 r18594  
    152152   void        SetupHeaderKeys(MRawRunHeader &header);
    153153
     154public:
    154155   //Header keys related stuff
    155156   template<typename _T>
     
    184185   }
    185186
    186 public:
    187187   template<typename _T>
    188188   bool SetHeaderKey(const std::string& key,
Note: See TracChangeset for help on using the changeset viewer.