diff options
author | crupest <crupest@outlook.com> | 2022-01-15 18:45:05 +0800 |
---|---|---|
committer | crupest <crupest@outlook.com> | 2022-01-15 18:45:05 +0800 |
commit | abb9d48a72e2d580d6bfbfcb600795c5ec66e204 (patch) | |
tree | 15d89cb51270533e4a8d1e52f437fa371bdb34a6 | |
parent | b6757b263ed304aed22eb2a472805f87bfb67f3a (diff) | |
download | cru-abb9d48a72e2d580d6bfbfcb600795c5ec66e204.tar.gz cru-abb9d48a72e2d580d6bfbfcb600795c5ec66e204.tar.bz2 cru-abb9d48a72e2d580d6bfbfcb600795c5ec66e204.zip |
...
-rw-r--r-- | include/cru/common/io/MemoryStream.hpp | 2 | ||||
-rw-r--r-- | include/cru/common/io/Stream.hpp | 2 | ||||
-rw-r--r-- | include/cru/common/io/UnixFileStream.hpp | 2 | ||||
-rw-r--r-- | src/common/io/MemoryStream.cpp | 2 | ||||
-rw-r--r-- | src/common/io/Stream.cpp | 2 | ||||
-rw-r--r-- | src/common/io/UnixFileStream.cpp | 2 |
6 files changed, 5 insertions, 7 deletions
diff --git a/include/cru/common/io/MemoryStream.hpp b/include/cru/common/io/MemoryStream.hpp index 96eea226..070ef2c6 100644 --- a/include/cru/common/io/MemoryStream.hpp +++ b/include/cru/common/io/MemoryStream.hpp @@ -29,8 +29,6 @@ class CRU_BASE_API MemoryStream : public Stream { bool CanWrite() override; Index Write(const std::byte* buffer, Index offset, Index size) override; - void Flush() override; - private: std::byte* buffer_ = nullptr; Index size_ = 0; diff --git a/include/cru/common/io/Stream.hpp b/include/cru/common/io/Stream.hpp index 5fa307ed..d75f3ee3 100644 --- a/include/cru/common/io/Stream.hpp +++ b/include/cru/common/io/Stream.hpp @@ -31,7 +31,7 @@ class CRU_BASE_API Stream : public Object { virtual Index Write(const std::byte* buffer, Index offset, Index size) = 0; virtual Index Write(const std::byte* buffer, Index size); - virtual void Flush() = 0; + virtual void Flush(); virtual void Close(); }; diff --git a/include/cru/common/io/UnixFileStream.hpp b/include/cru/common/io/UnixFileStream.hpp index afeab184..8bd3829a 100644 --- a/include/cru/common/io/UnixFileStream.hpp +++ b/include/cru/common/io/UnixFileStream.hpp @@ -29,8 +29,6 @@ class UnixFileStream : public Stream { bool CanWrite() override; Index Write(const std::byte* buffer, Index offset, Index size) override; - void Flush() override; - void Close() override; private: diff --git a/src/common/io/MemoryStream.cpp b/src/common/io/MemoryStream.cpp index e3c9c605..bd561f5d 100644 --- a/src/common/io/MemoryStream.cpp +++ b/src/common/io/MemoryStream.cpp @@ -49,6 +49,4 @@ Index MemoryStream::Write(const std::byte *buffer, Index offset, Index size) { position_ += size; return size; } - -void MemoryStream::Flush() {} } // namespace cru::io diff --git a/src/common/io/Stream.cpp b/src/common/io/Stream.cpp index 1a39b653..7c30406f 100644 --- a/src/common/io/Stream.cpp +++ b/src/common/io/Stream.cpp @@ -19,5 +19,7 @@ Index Stream::Write(const std::byte* buffer, Index size) { return Write(buffer, 0, size); } +void Stream::Flush() {} + void Stream::Close() {} } // namespace cru::io diff --git a/src/common/io/UnixFileStream.cpp b/src/common/io/UnixFileStream.cpp index 23c11dad..4fa61b7b 100644 --- a/src/common/io/UnixFileStream.cpp +++ b/src/common/io/UnixFileStream.cpp @@ -53,6 +53,8 @@ int MapSeekOrigin(Stream::SeekOrigin origin) { } } // namespace +UnixFileStream::~UnixFileStream() { Close(); } + UnixFileStream::UnixFileStream(String path, OpenFileFlag flags) { file_descriptor_ = ::open(path.ToUtf8().c_str(), MapOpenFileFlag(flags)); if (file_descriptor_ == -1) { |