comparison data/fileio/MatrixFile.h @ 1206:659372323b45 tony-2.0-integration

Merge latest SV 3.0 branch code

     published by the Free Software Foundation; either version 2 of the
     License, or (at your option) any later version.  See the file
     COPYING included with this distribution for more information.
 */
 
-#ifndef _MATRIX_FILE_CACHE_H_
-#define _MATRIX_FILE_CACHE_H_
-
-#include "base/ResizeableBitset.h"
+#ifndef MATRIX_FILE_H
+#define MATRIX_FILE_H
 
 #include "FileReadThread.h"
 
 #include <sys/types.h>
 #include <QString>

     int     m_width;
     int     m_height;
     int     m_headerSize;
     QString m_fileName;
 
-    ResizeableBitset *m_setColumns; // only in writer
+    std::vector<bool> m_setColumns; // only populated in writer
     bool m_autoClose;
 
     // In reader: if this is >= 0, we can read that column directly
     // without seeking (and we know that the column exists)
     mutable int m_readyToReadColumn;