Changeset 20115 for trunk/Mars/mcore


Ignore:
Timestamp:
11/21/22 08:10:47 (2 years ago)
Author:
tbretz
Message:
Added some std:: requested by the compiler.
Location:
trunk/Mars/mcore
Files:
3 edited

Legend:

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

    r20067 r20115  
    475475        // There may be a gap between the main table and the start of the heap:
    476476        // this computes the offset
    477         streamoff GetHeapShift() const
     477        std::streamoff GetHeapShift() const
    478478        {
    479479            if (!HasKey("ZHEAPPTR"))
     
    485485
    486486        // return total number of bytes 'all inclusive'
    487         streamoff GetTotalBytes() const
     487        std::streamoff GetTotalBytes() const
    488488        {
    489489            //get offset of special data area from start of main table
    490             const streamoff shift = GetHeapShift();
     490            const std::streamoff shift = GetHeapShift();
    491491
    492492            //and special data area size
    493             const streamoff size  = HasKey("PCOUNT") ? Get<streamoff>("PCOUNT") : 0;
     493            const std::streamoff size  = HasKey("PCOUNT") ? Get<std::streamoff>("PCOUNT") : 0;
    494494
    495495            // Get the total size
    496             const streamoff total = total_bytes + size + shift;
     496            const std::streamoff total = total_bytes + size + shift;
    497497
    498498            // check for padding
     
    684684                if ((!tableName.empty() && tableName!=tname) || (tableName.empty() && "ZDrsCellOffsets"==tname))
    685685                {
    686                     const streamoff skip = fTable.GetTotalBytes();
     686                    const std::streamoff skip = fTable.GetTotalBytes();
    687687                    seekg(skip, std::ios_base::cur);
    688688
     
    720720        }
    721721
    722         const streampos p = tellg();
     722        const std::streampos p = tellg();
    723723        seekg(0);
    724724
  • trunk/Mars/mcore/izstream.h

    r17140 r20115  
    139139        }
    140140
    141         const streampos pos = gzseek(fFile, offset-sbuf, SEEK_CUR);
     141        const std::streampos pos = gzseek(fFile, offset-sbuf, SEEK_CUR);
    142142
    143143        // Buffer is empty - force refilling
    144144        setg(fBuffer+4, fBuffer+4, fBuffer+4);
    145145
    146         return pos<0 ? streampos(EOF) : pos;
     146        return pos<0 ? std::streampos(EOF) : pos;
    147147
    148148        /*
  • trunk/Mars/mcore/zfits.h

    r20066 r20115  
    145145    size_t fShrinkFactor;   ///< shrink factor
    146146
    147     streamoff fHeapOff;           ///< offset from the beginning of the file of the binary data
    148     streamoff fHeapFromDataStart; ///< offset from the beginning of the data table
     147    std::streamoff fHeapOff;           ///< offset from the beginning of the file of the binary data
     148    std::streamoff fHeapFromDataStart; ///< offset from the beginning of the data table
    149149
    150150    std::vector<std::vector<std::pair<int64_t, int64_t>>> fCatalog;     ///< Catalog, i.e. the main table that points to the compressed data.
     
    184184        fCatalog.resize(fNumTiles);
    185185
    186         const streampos catalogStart = tellg();
     186        const std::streampos catalogStart = tellg();
    187187
    188188        fChkData.reset();
     
    569569    {
    570570        //goto start of heap
    571         const streamoff whereAreWe = tellg();
     571        const std::streamoff whereAreWe = tellg();
    572572        seekg(fHeapOff);
    573573
     
    583583        FITS::BlockHeader columnHead;
    584584
    585         streamoff offsetInHeap = 0;
     585        std::streamoff offsetInHeap = 0;
    586586        //skip through the heap
    587587        while (true)
Note: See TracChangeset for help on using the changeset viewer.