Leave dataio header in public API

Author: arahlin

core/include/core/G3Reader.h

@@ -27,7 +27,6 @@ class G3Reader : public G3Module {
 	std::string cur_file_;
 	std::deque<std::string> filename_;
 	std::istream stream_;
-	int fd_;
 	int n_frames_to_read_;
 	int n_frames_read_;
 	int n_frames_cur_;

core/src/dataio.h core/include/core/dataio.hcore/src/dataio.h renamed to core/include/core/dataio.h

@@ -2,7 +2,7 @@
 #include <string>
 #include <G3Module.h>
 
-#include "dataio.h"
+#include <dataio.h>
 
 class G3MultiFileWriter : public G3Module {
 public:

core/src/G3MultiFileWriter.cxx

@@ -4,8 +4,7 @@
 
 G3Reader::G3Reader(const std::string &filename, int n_frames_to_read,
     float timeout, bool track_filename, size_t buffersize) :
-    prefix_file_(false), stream_(nullptr), fd_(-1),
-    n_frames_to_read_(n_frames_to_read),
+    prefix_file_(false), stream_(nullptr), n_frames_to_read_(n_frames_to_read),
     n_frames_read_(0), n_frames_cur_(0), timeout_(timeout),
     track_filename_(track_filename), buffersize_(buffersize)
 {
@@ -14,8 +13,7 @@ G3Reader::G3Reader(const std::string &filename, int n_frames_to_read,
 
 G3Reader::G3Reader(const std::vector<std::string> &filename, int n_frames_to_read,
     float timeout, bool track_filename, size_t buffersize) :
-    prefix_file_(false), stream_(nullptr), fd_(-1),
-    n_frames_to_read_(n_frames_to_read),
+    prefix_file_(false), stream_(nullptr), n_frames_to_read_(n_frames_to_read),
     n_frames_read_(0), n_frames_cur_(0), timeout_(timeout),
     track_filename_(track_filename), buffersize_(buffersize)
 {
@@ -35,7 +33,6 @@ void G3Reader::StartFile(const std::string &path)
 	cur_file_ = path;
 	n_frames_cur_ = 0;
 	g3_istream_from_path(stream_, path, timeout_, buffersize_);
-	fd_ = g3_istream_handle(stream_);
 }
 
 G3FramePtr G3Reader::FillFrame()

core/src/G3Reader.cxx

@@ -1,6 +1,6 @@
 #include <pybindings.h>
 #include <G3Writer.h>
-#include "dataio.h"
+#include <dataio.h>
 
 G3Writer::G3Writer(std::string filename,
     std::vector<G3Frame::FrameType> streams,

core/src/G3Writer.cxx

@@ -1,5 +1,5 @@
 #include <G3Logging.h>
-#include "dataio.h"
+#include <dataio.h>
 #include "streams.h"
 
 #include <filesystem>

core/src/dataio.cxx

@@ -6,6 +6,7 @@
 #include <G3Vector.h>
 #include <G3Data.h>
 #include <G3Units.h>
+#include <dataio.h>
 #include <gcp/Experiments.h>
 
 #include <string.h>
@@ -108,6 +109,7 @@ class ARCFileReader : public G3Reader {
 	bool has_string_flag_;
 	off_t frame_length_;
 	uint64_t ms_jiffie_base_;
+	int fd_;
 	int32_t revision_;
 
 	void ParseArrayMap(uint8_t *buffer, size_t size);
@@ -169,6 +171,7 @@ void ARCFileReader::ReadHeader()
 	int32_t size, opcode;
 	uint8_t *buffer;
 
+	fd_ = g3_istream_handle(stream_);
 	revision_ = 0;
 	has_string_flag_ = false;