From d15172cfe1ac8558567c1b1c10c2e671b0d1f033 Mon Sep 17 00:00:00 2001 From: crupest Date: Thu, 3 Feb 2022 14:55:17 +0800 Subject: ... --- include/cru/common/io/MemoryStream.hpp | 3 +-- include/cru/common/io/Stream.hpp | 4 ++-- include/cru/common/platform/win/Win32FileStream.hpp | 5 ++--- 3 files changed, 5 insertions(+), 7 deletions(-) (limited to 'include') diff --git a/include/cru/common/io/MemoryStream.hpp b/include/cru/common/io/MemoryStream.hpp index a1be1354..e917814c 100644 --- a/include/cru/common/io/MemoryStream.hpp +++ b/include/cru/common/io/MemoryStream.hpp @@ -23,8 +23,7 @@ class CRU_BASE_API MemoryStream : public Stream { public: bool CanSeek() override; - Index Tell() override; - void Seek(Index offset, SeekOrigin origin = SeekOrigin::Current) override; + Index Seek(Index offset, SeekOrigin origin = SeekOrigin::Current) override; bool CanRead() override; Index Read(std::byte* buffer, Index offset, Index size) override; diff --git a/include/cru/common/io/Stream.hpp b/include/cru/common/io/Stream.hpp index 78beba21..131e82e9 100644 --- a/include/cru/common/io/Stream.hpp +++ b/include/cru/common/io/Stream.hpp @@ -21,8 +21,8 @@ class CRU_BASE_API Stream : public Object { public: virtual bool CanSeek() = 0; - virtual Index Tell() = 0; - virtual void Seek(Index offset, SeekOrigin origin = SeekOrigin::Current) = 0; + virtual Index Seek(Index offset, SeekOrigin origin = SeekOrigin::Current) = 0; + virtual Index Tell(); virtual void Rewind(); virtual Index GetSize(); diff --git a/include/cru/common/platform/win/Win32FileStream.hpp b/include/cru/common/platform/win/Win32FileStream.hpp index 231a7ec6..ebb23357 100644 --- a/include/cru/common/platform/win/Win32FileStream.hpp +++ b/include/cru/common/platform/win/Win32FileStream.hpp @@ -24,8 +24,7 @@ class CRU_BASE_API Win32FileStream : public io::Stream { public: bool CanSeek() override; - Index Tell() override; - void Seek(Index offset, SeekOrigin origin = SeekOrigin::Current) override; + Index Seek(Index offset, SeekOrigin origin = SeekOrigin::Current) override; bool CanRead() override; Index Read(std::byte* buffer, Index offset, Index size) override; @@ -47,6 +46,6 @@ class CRU_BASE_API Win32FileStream : public io::Stream { details::Win32FileStreamPrivate* p_; }; -} // namespace cru::io +} // namespace cru::platform::win #endif -- cgit v1.2.3