From 500aa5130f3f5ad211749018d7be9b0ab46c12b4 Mon Sep 17 00:00:00 2001 From: rtk0c Date: Sun, 29 Aug 2021 11:43:53 -0700 Subject: Change DataStream to use FileStream instead of std::fstream --- core/src/Utils/IO/DataStream.hpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'core/src/Utils/IO/DataStream.hpp') diff --git a/core/src/Utils/IO/DataStream.hpp b/core/src/Utils/IO/DataStream.hpp index d1f3647..fa22549 100644 --- a/core/src/Utils/IO/DataStream.hpp +++ b/core/src/Utils/IO/DataStream.hpp @@ -1,11 +1,11 @@ #pragma once +#include "FileStream.hpp" #include "cplt_fwd.hpp" #include #include #include -#include #include class BaseDataStream @@ -21,7 +21,7 @@ public: class InputDataStream : public BaseDataStream { private: - std::fstream mBackend; + InputFileStream mBackend; public: static constexpr bool IsSerializer() @@ -29,7 +29,7 @@ public: return false; } - InputDataStream(std::fstream stream); + InputDataStream(InputFileStream stream); void ReadBytes(size_t byteCount, std::byte* buffer); void ReadBytes(size_t byteCount, char* buffer); @@ -65,7 +65,7 @@ public: { if constexpr (requires(TObject t) { t.ReadFromDataStream(std::declval()); }) { obj.ReadFromDataStream(*this); - } else if constexpr (requires(TObject t) { t.OperateIOProxy(std::declval()); }) { + } else if constexpr (requires(TObject t) { t.OperateIOProxy(std::declval()); }) { obj.OperateIOProxy(*this); } else { static_assert(false && sizeof(TObject), "This type does not have integration with InputDataStream."); @@ -82,25 +82,25 @@ public: // Proxy functions for OperateIOProxy template - void Bytes(size_t byteCount, T* buffer) const + void Bytes(size_t byteCount, T* buffer) { ReadBytes(byteCount, buffer); } template - void Value(T& t) const + void Value(T& t) { Read(t); } template - void Object(T& obj) const + void Object(T& obj) { ReadObject(obj); } template - void ObjectAdapted(TObject& obj, TAdapter&& adapter) const + void ObjectAdapted(TObject& obj, TAdapter&& adapter) { ReadObjectAdapted(obj, adapter); } @@ -109,7 +109,7 @@ public: class OutputDataStream : public BaseDataStream { private: - std::fstream mBackend; + OutputFileStream mBackend; public: static constexpr bool IsSerializer() @@ -117,7 +117,7 @@ public: return true; } - OutputDataStream(std::fstream stream); + OutputDataStream(OutputFileStream stream); void WriteBytes(size_t byteCount, const std::byte* buffer); void WriteBytes(size_t byteCount, const char* buffer); @@ -151,7 +151,7 @@ public: { if constexpr (requires(TObject t) { t.WriteToDataStream(std::declval()); }) { obj.WriteToDataStream(*this); - } else if constexpr (requires(TObject t) { t.OperateIOProxy(std::declval()); }) { + } else if constexpr (requires(TObject t) { t.OperateIOProxy(std::declval()); }) { obj.OperateIOProxy(*this); } else { static_assert(false && sizeof(TObject), "This type does not have integration with OutputDataStream."); @@ -168,25 +168,25 @@ public: // Proxy functions for OperateIOProxy template - void Bytes(size_t byteCount, T* buffer) const + void Bytes(size_t byteCount, T* buffer) { WriteBytes(byteCount, buffer); } template - void Value(T t) const + void Value(T t) { Write(t); } template - void Object(T& obj) const + void Object(T& obj) { WriteObject(obj); } template - void ObjectAdapted(TObject& obj, TAdapter&& adapter) const + void ObjectAdapted(TObject& obj, TAdapter&& adapter) { WriteObjectAdapted(obj, adapter); } -- cgit v1.2.3-70-g09d2