Use std::streamoff for BinaryIO offset vars

r-ex · Dec 23, 2024 · 234bfb0 · 234bfb0
1 parent 092a81a
commit 234bfb0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/utils/binaryio.cpp b/src/utils/binaryio.cpp
@@ -118,25 +118,25 @@ std::streampos BinaryIO::TellPut()
 // Input  : offset - 
 //			way - 
 //-----------------------------------------------------------------------------
-void BinaryIO::SeekGet(const std::streampos offset, const std::ios_base::seekdir way)
+void BinaryIO::SeekGet(const std::streamoff offset, const std::ios_base::seekdir way)
 {
 	assert(IsReadMode());
 	m_stream.seekg(offset, way);
 }
-void BinaryIO::SeekPut(const std::streampos offset, const std::ios_base::seekdir way)
+void BinaryIO::SeekPut(const std::streamoff offset, const std::ios_base::seekdir way)
 {
 	assert(IsWriteMode());
 
 	m_stream.seekp(offset, way);
-	const std::streampos newOffset = m_stream.tellp();
+	const std::streamoff newOffset = m_stream.tellp();
 
 	// seekp writes padding when we go beyond eof, therefore we should update
 	// the size in case this happens.
 	if (newOffset > m_size)
 		m_size = newOffset;
 
 }
-void BinaryIO::Seek(const std::streampos offset, const std::ios_base::seekdir way)
+void BinaryIO::Seek(const std::streamoff offset, const std::ios_base::seekdir way)
 {
 	if (IsReadMode())
 		SeekGet(offset, way);
@@ -157,7 +157,7 @@ const std::filebuf* BinaryIO::GetData() const
 // Purpose: returns the data size
 // Output : std::streampos
 //-----------------------------------------------------------------------------
-const std::streampos BinaryIO::GetSize() const
+const std::streamoff BinaryIO::GetSize() const
 {
 	return m_size;
 }

diff --git a/src/utils/binaryio.h b/src/utils/binaryio.h
@@ -24,12 +24,12 @@ class BinaryIO
 	std::streampos TellGet();
 	std::streampos TellPut();
 
-	void SeekGet(const std::streampos offset, const std::ios_base::seekdir way = std::ios::beg);
-	void SeekPut(const std::streampos offset, const std::ios_base::seekdir way = std::ios::beg);
-	void Seek(const std::streampos offset, const std::ios_base::seekdir way = std::ios::beg);
+	void SeekGet(const std::streamoff offset, const std::ios_base::seekdir way = std::ios::beg);
+	void SeekPut(const std::streamoff offset, const std::ios_base::seekdir way = std::ios::beg);
+	void Seek(const std::streamoff offset, const std::ios_base::seekdir way = std::ios::beg);
 
 	const std::filebuf* GetData() const;
-	const std::streampos GetSize() const;
+	const std::streamoff GetSize() const;
 
 	bool IsReadMode() const;
 	bool IsWriteMode() const;
@@ -110,7 +110,7 @@ class BinaryIO
 
 private:
 	std::fstream            m_stream; // I/O stream.
-	std::streampos          m_size;   // File size.
+	std::streamoff          m_size;   // File size.
 	std::ios_base::openmode m_flags;  // Stream flags.
 	Mode_e                  m_mode;   // Stream mode.
 };