Change DataStream to use FileStream instead of std::fstream

1 files changed, 28 insertions, 28 deletions

diff --git a/core/src/Utils/IO/DataStream.cpp b/core/src/Utils/IO/DataStream.cpp
index 7fee881..bfc6252 100644
--- a/core/src/Utils/IO/DataStream.cpp
+++ b/core/src/Utils/IO/DataStream.cpp
@@ -55,41 +55,41 @@ void BaseDataStream::SetEndianness(std::endian endianness)
 	mEndian = endianness;
 }
 
-InputDataStream::InputDataStream(std::fstream stream)
+InputDataStream::InputDataStream(InputFileStream stream)
 	: mBackend{ std::move(stream) }
 {
 }
 
 void InputDataStream::ReadBytes(size_t byteCount, std::byte* buffer)
 {
-	mBackend.read(reinterpret_cast<char*>(buffer), static_cast<std::streamsize>(byteCount));
+	mBackend.ReadBytes(static_cast<std::streamsize>(byteCount),reinterpret_cast<std::byte*>(buffer));
 }
 
 void InputDataStream::ReadBytes(size_t byteCount, char* buffer)
 {
-	mBackend.read(reinterpret_cast<char*>(buffer), static_cast<std::streamsize>(byteCount));
+	mBackend.ReadBytes(static_cast<std::streamsize>(byteCount),reinterpret_cast<std::byte*>(buffer));
 }
 
 void InputDataStream::ReadBytes(size_t byteCount, signed char* buffer)
 {
-	mBackend.read(reinterpret_cast<char*>(buffer), static_cast<std::streamsize>(byteCount));
+	mBackend.ReadBytes(static_cast<std::streamsize>(byteCount),reinterpret_cast<std::byte*>(buffer));
 }
 
 void InputDataStream::ReadBytes(size_t byteCount, unsigned char* buffer)
 {
-	mBackend.read(reinterpret_cast<char*>(buffer), static_cast<std::streamsize>(byteCount));
+	mBackend.ReadBytes(static_cast<std::streamsize>(byteCount),reinterpret_cast<std::byte*>(buffer));
 }
 
 void InputDataStream::Read(int8_t& n)
 {
 	// sizeof() of a reference type yields the size of the reference
-	mBackend.read(reinterpret_cast<char*>(&n), sizeof(n));
+	mBackend.ReadBytes(sizeof(n),reinterpret_cast<std::byte*>(&n));
 }
 
 void InputDataStream::Read(int16_t& n)
 {
 	int16_t tmp;
-	mBackend.read(reinterpret_cast<char*>(&tmp), sizeof(tmp));
+	mBackend.ReadBytes(sizeof(tmp),reinterpret_cast<std::byte*>(&tmp));
 	if (GetEndianness() != std::endian::native) {
 		n = ::ByteSwap(tmp);
 	} else {
@@ -100,7 +100,7 @@ void InputDataStream::Read(int16_t& n)
 void InputDataStream::Read(int32_t& n)
 {
 	int32_t tmp;
-	mBackend.read(reinterpret_cast<char*>(&tmp), sizeof(tmp));
+	mBackend.ReadBytes(sizeof(tmp),reinterpret_cast<std::byte*>(&tmp));
 	if (GetEndianness() != std::endian::native) {
 		n = ::ByteSwap(tmp);
 	} else {
@@ -111,7 +111,7 @@ void InputDataStream::Read(int32_t& n)
 void InputDataStream::Read(int64_t& n)
 {
 	int64_t tmp;
-	mBackend.read(reinterpret_cast<char*>(&tmp), sizeof(tmp));
+	mBackend.ReadBytes(sizeof(tmp),reinterpret_cast<std::byte*>(&tmp));
 	if (GetEndianness() != std::endian::native) {
 		n = ::ByteSwap(tmp);
 	} else {
@@ -121,13 +121,13 @@ void InputDataStream::Read(int64_t& n)
 
 void InputDataStream::Read(uint8_t& n)
 {
-	mBackend.read(reinterpret_cast<char*>(&n), sizeof(n));
+	mBackend.ReadBytes(sizeof(n),reinterpret_cast<std::byte*>(&n));
 }
 
 void InputDataStream::Read(uint16_t& n)
 {
 	uint16_t tmp;
-	mBackend.read(reinterpret_cast<char*>(&tmp), sizeof(tmp));
+	mBackend.ReadBytes(sizeof(tmp),reinterpret_cast<std::byte*>(&tmp));
 	if (GetEndianness() != std::endian::native) {
 		n = ::ByteSwap(tmp);
 	} else {
@@ -138,7 +138,7 @@ void InputDataStream::Read(uint16_t& n)
 void InputDataStream::Read(uint32_t& n)
 {
 	uint32_t tmp;
-	mBackend.read(reinterpret_cast<char*>(&tmp), sizeof(tmp));
+	mBackend.ReadBytes(sizeof(tmp),reinterpret_cast<std::byte*>(&tmp));
 	if (GetEndianness() != std::endian::native) {
 		n = ::ByteSwap(tmp);
 	} else {
@@ -149,7 +149,7 @@ void InputDataStream::Read(uint32_t& n)
 void InputDataStream::Read(uint64_t& n)
 {
 	uint64_t tmp;
-	mBackend.read(reinterpret_cast<char*>(&tmp), sizeof(tmp));
+	mBackend.ReadBytes(sizeof(tmp),reinterpret_cast<std::byte*>(&tmp));
 	if (GetEndianness() != std::endian::native) {
 		n = ::ByteSwap(tmp);
 	} else {
@@ -181,34 +181,34 @@ void InputDataStream::Read(double& n)
 	n = std::bit_cast<double>(buffer);
 }
 
-OutputDataStream::OutputDataStream(std::fstream stream)
+OutputDataStream::OutputDataStream(OutputFileStream stream)
 	: mBackend{ std::move(stream) }
 {
 }
 
 void OutputDataStream::WriteBytes(size_t byteCount, const std::byte* buffer)
 {
-	mBackend.write(reinterpret_cast<const char*>(buffer), static_cast<std::streamsize>(byteCount));
+	mBackend.WriteBytes(static_cast<std::streamsize>(byteCount), reinterpret_cast<const std::byte*>(buffer));
 }
 
 void OutputDataStream::WriteBytes(size_t byteCount, const char* buffer)
 {
-	mBackend.write(reinterpret_cast<const char*>(buffer), static_cast<std::streamsize>(byteCount));
+	mBackend.WriteBytes(static_cast<std::streamsize>(byteCount), reinterpret_cast<const std::byte*>(buffer));
 }
 
 void OutputDataStream::WriteBytes(size_t byteCount, const signed char* buffer)
 {
-	mBackend.write(reinterpret_cast<const char*>(buffer), static_cast<std::streamsize>(byteCount));
+	mBackend.WriteBytes(static_cast<std::streamsize>(byteCount), reinterpret_cast<const std::byte*>(buffer));
 }
 
 void OutputDataStream::WriteBytes(size_t byteCount, const unsigned char* buffer)
 {
-	mBackend.write(reinterpret_cast<const char*>(buffer), static_cast<std::streamsize>(byteCount));
+	mBackend.WriteBytes(static_cast<std::streamsize>(byteCount), reinterpret_cast<const std::byte*>(buffer));
 }
 
 void OutputDataStream::Write(int8_t n)
 {
-	mBackend.write(reinterpret_cast<const char*>(&n), sizeof(n));
+	mBackend.WriteBytes(sizeof(n), reinterpret_cast<const std::byte*>(&n));
 }
 
 void OutputDataStream::Write(int16_t n)
@@ -216,7 +216,7 @@ void OutputDataStream::Write(int16_t n)
 	if (GetEndianness() != std::endian::native) {
 		n = ::ByteSwap(n);
 	}
-	mBackend.write(reinterpret_cast<const char*>(&n), sizeof(n));
+	mBackend.WriteBytes(sizeof(n), reinterpret_cast<const std::byte*>(&n));
 }
 
 void OutputDataStream::Write(int32_t n)
@@ -224,7 +224,7 @@ void OutputDataStream::Write(int32_t n)
 	if (GetEndianness() != std::endian::native) {
 		n = ::ByteSwap(n);
 	}
-	mBackend.write(reinterpret_cast<const char*>(&n), sizeof(n));
+	mBackend.WriteBytes(sizeof(n), reinterpret_cast<const std::byte*>(&n));
 }
 
 void OutputDataStream::Write(int64_t n)
@@ -232,12 +232,12 @@ void OutputDataStream::Write(int64_t n)
 	if (GetEndianness() != std::endian::native) {
 		n = ::ByteSwap(n);
 	}
-	mBackend.write(reinterpret_cast<const char*>(&n), sizeof(n));
+	mBackend.WriteBytes(sizeof(n), reinterpret_cast<const std::byte*>(&n));
 }
 
 void OutputDataStream::Write(uint8_t n)
 {
-	mBackend.write(reinterpret_cast<const char*>(&n), sizeof(n));
+	mBackend.WriteBytes(sizeof(n), reinterpret_cast<const std::byte*>(&n));
 }
 
 void OutputDataStream::Write(uint16_t n)
@@ -245,7 +245,7 @@ void OutputDataStream::Write(uint16_t n)
 	if (GetEndianness() != std::endian::native) {
 		n = ::ByteSwap(n);
 	}
-	mBackend.write(reinterpret_cast<const char*>(&n), sizeof(n));
+	mBackend.WriteBytes(sizeof(n), reinterpret_cast<const std::byte*>(&n));
 }
 
 void OutputDataStream::Write(uint32_t n)
@@ -253,7 +253,7 @@ void OutputDataStream::Write(uint32_t n)
 	if (GetEndianness() != std::endian::native) {
 		n = ::ByteSwap(n);
 	}
-	mBackend.write(reinterpret_cast<const char*>(&n), sizeof(n));
+	mBackend.WriteBytes(sizeof(n), reinterpret_cast<const std::byte*>(&n));
 }
 
 void OutputDataStream::Write(uint64_t n)
@@ -261,7 +261,7 @@ void OutputDataStream::Write(uint64_t n)
 	if (GetEndianness() != std::endian::native) {
 		n = ::ByteSwap(n);
 	}
-	mBackend.write(reinterpret_cast<const char*>(&n), sizeof(n));
+	mBackend.WriteBytes(sizeof(n), reinterpret_cast<const std::byte*>(&n));
 }
 
 void OutputDataStream::Write(float n)
@@ -270,7 +270,7 @@ void OutputDataStream::Write(float n)
 	if (GetEndianness() != std::endian::native) {
 		buffer = ::ByteSwap(buffer);
 	}
-	mBackend.read(reinterpret_cast<char*>(&buffer), sizeof(buffer));
+	mBackend.WriteBytes(sizeof(buffer), reinterpret_cast<const std::byte*>(&buffer));
 }
 
 void OutputDataStream::Write(double n)
@@ -279,5 +279,5 @@ void OutputDataStream::Write(double n)
 	if (GetEndianness() != std::endian::native) {
 		buffer = ::ByteSwap(buffer);
 	}
-	mBackend.read(reinterpret_cast<char*>(&buffer), sizeof(buffer));
+	mBackend.WriteBytes(sizeof(buffer), reinterpret_cast<const std::byte*>(&buffer));
 }