Changeset 20115 for trunk/Mars

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:

• fits.h (modified) (4 diffs)
• izstream.h (modified) (1 diff)
• zfits.h (modified) (4 diffs)

trunk/Mars/mcore/fits.h

@@ -475 +475 @@
         // There may be a gap between the main table and the start of the heap:
         // this computes the offset
-        streamoff GetHeapShift() const
+        std::streamoff GetHeapShift() const
         {
             if (!HasKey("ZHEAPPTR"))
@@ -485 +485 @@
 
         // return total number of bytes 'all inclusive'
-        streamoff GetTotalBytes() const
+        std::streamoff GetTotalBytes() const
         {
             //get offset of special data area from start of main table
-            const streamoff shift = GetHeapShift();
+            const std::streamoff shift = GetHeapShift();
 
             //and special data area size
-            const streamoff size  = HasKey("PCOUNT") ? Get<streamoff>("PCOUNT") : 0;
+            const std::streamoff size  = HasKey("PCOUNT") ? Get<std::streamoff>("PCOUNT") : 0;
 
             // Get the total size
-            const streamoff total = total_bytes + size + shift;
+            const std::streamoff total = total_bytes + size + shift;
 
             // check for padding
@@ -684 +684 @@
                 if ((!tableName.empty() && tableName!=tname) || (tableName.empty() && "ZDrsCellOffsets"==tname))
                 {
-                    const streamoff skip = fTable.GetTotalBytes();
+                    const std::streamoff skip = fTable.GetTotalBytes();
                     seekg(skip, std::ios_base::cur);
 
@@ -720 +720 @@
         }
 
-        const streampos p = tellg();
+        const std::streampos p = tellg();
         seekg(0);
 

trunk/Mars/mcore/izstream.h

@@ -139 +139 @@
         }
 
-        const streampos pos = gzseek(fFile, offset-sbuf, SEEK_CUR);
+        const std::streampos pos = gzseek(fFile, offset-sbuf, SEEK_CUR);
 
         // Buffer is empty - force refilling
         setg(fBuffer+4, fBuffer+4, fBuffer+4);
 
-        return pos<0 ? streampos(EOF) : pos;
+        return pos<0 ? std::streampos(EOF) : pos;
 
         /*

trunk/Mars/mcore/zfits.h

@@ -145 +145 @@
     size_t fShrinkFactor;   ///< shrink factor
 
-    streamoff fHeapOff;           ///< offset from the beginning of the file of the binary data
-    streamoff fHeapFromDataStart; ///< offset from the beginning of the data table
+    std::streamoff fHeapOff;           ///< offset from the beginning of the file of the binary data
+    std::streamoff fHeapFromDataStart; ///< offset from the beginning of the data table
 
     std::vector<std::vector<std::pair<int64_t, int64_t>>> fCatalog;     ///< Catalog, i.e. the main table that points to the compressed data.
@@ -184 +184 @@
         fCatalog.resize(fNumTiles);
 
-        const streampos catalogStart = tellg();
+        const std::streampos catalogStart = tellg();
 
         fChkData.reset();
@@ -569 +569 @@
     {
         //goto start of heap
-        const streamoff whereAreWe = tellg();
+        const std::streamoff whereAreWe = tellg();
         seekg(fHeapOff);
 
@@ -583 +583 @@
         FITS::BlockHeader columnHead;
 
-        streamoff offsetInHeap = 0;
+        std::streamoff offsetInHeap = 0;
         //skip through the heap
         while (true)