From 71c01a175a939d1a519ab235fdfdeec1101f8b84 Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Tue, 25 Jan 2022 17:48:53 +0800
Subject: ...

---
 include/cru/common/ErrnoException.hpp              | 28 -------------
 include/cru/common/io/FileStream.hpp               |  4 +-
 include/cru/common/io/UnixFileStream.hpp           | 47 ----------------------
 .../cru/common/platform/unix/ErrnoException.hpp    | 28 +++++++++++++
 .../cru/common/platform/unix/UnixFileStream.hpp    | 47 ++++++++++++++++++++++
 5 files changed, 77 insertions(+), 77 deletions(-)
 delete mode 100644 include/cru/common/ErrnoException.hpp
 delete mode 100644 include/cru/common/io/UnixFileStream.hpp
 create mode 100644 include/cru/common/platform/unix/ErrnoException.hpp
 create mode 100644 include/cru/common/platform/unix/UnixFileStream.hpp

(limited to 'include/cru/common')

diff --git a/include/cru/common/ErrnoException.hpp b/include/cru/common/ErrnoException.hpp
deleted file mode 100644
index d1390cf2..00000000
--- a/include/cru/common/ErrnoException.hpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#pragma once
-
-#include "PreConfig.hpp"
-
-#ifdef CRU_PLATFORM_UNIX
-
-#include "Exception.hpp"
-
-namespace cru {
-class ErrnoException : public Exception {
- public:
-  ErrnoException() : ErrnoException(String{}) {}
-  explicit ErrnoException(const String& message);
-  ErrnoException(const String& message, int errno_code);
-
-  CRU_DELETE_COPY(ErrnoException)
-  CRU_DELETE_MOVE(ErrnoException)
-
-  ~ErrnoException() override = default;
-
-  int GetErrnoCode() const { return errno_code_; }
-
- private:
-  int errno_code_;
-};
-}  // namespace cru
-
-#endif
diff --git a/include/cru/common/io/FileStream.hpp b/include/cru/common/io/FileStream.hpp
index 73c7b61e..86c4c037 100644
--- a/include/cru/common/io/FileStream.hpp
+++ b/include/cru/common/io/FileStream.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
 #ifdef CRU_PLATFORM_UNIX
-#include "UnixFileStream.hpp"
+#include "../platform/unix/UnixFileStream.hpp"
 namespace cru::io {
-using FileStream = UnixFileStream;
+using FileStream = platform::unix::UnixFileStream;
 }
 #elif CRU_PLATFORM_WINDOWS
 #include "../platform/win/Win32FileStream.hpp"
diff --git a/include/cru/common/io/UnixFileStream.hpp b/include/cru/common/io/UnixFileStream.hpp
deleted file mode 100644
index 633b9bd1..00000000
--- a/include/cru/common/io/UnixFileStream.hpp
+++ /dev/null
@@ -1,47 +0,0 @@
-#pragma once
-
-#include "../PreConfig.hpp"
-
-#ifdef CRU_PLATFORM_UNIX
-
-#include "../String.hpp"
-#include "OpenFileFlag.hpp"
-#include "Stream.hpp"
-
-namespace cru::io {
-class UnixFileStream : public Stream {
- public:
-  UnixFileStream(String path, OpenFileFlag flags);
-
-  CRU_DELETE_COPY(UnixFileStream)
-  CRU_DELETE_MOVE(UnixFileStream)
-
-  ~UnixFileStream() override;
-
- public:
-  bool CanSeek() override;
-  Index Tell() override;
-  void Seek(Index offset, SeekOrigin origin = SeekOrigin::Current) override;
-
-  bool CanRead() override;
-  Index Read(std::byte* buffer, Index offset, Index size) override;
-  using Stream::Read;
-
-  bool CanWrite() override;
-  Index Write(const std::byte* buffer, Index offset, Index size) override;
-  using Stream::Write;
-
-  void Close() override;
-
- private:
-  void CheckClosed();
-
- private:
-  String path_;
-  OpenFileFlag flags_;
-  int file_descriptor_;
-  bool closed_ = false;
-};
-}  // namespace cru::io
-
-#endif
diff --git a/include/cru/common/platform/unix/ErrnoException.hpp b/include/cru/common/platform/unix/ErrnoException.hpp
new file mode 100644
index 00000000..2982e26a
--- /dev/null
+++ b/include/cru/common/platform/unix/ErrnoException.hpp
@@ -0,0 +1,28 @@
+#pragma once
+
+#include "../../PreConfig.hpp"
+
+#ifdef CRU_PLATFORM_UNIX
+
+#include "../Exception.hpp"
+
+namespace cru::platform::unix {
+class ErrnoException : public PlatformException {
+ public:
+  ErrnoException() : ErrnoException(String{}) {}
+  explicit ErrnoException(const String& message);
+  ErrnoException(const String& message, int errno_code);
+
+  CRU_DELETE_COPY(ErrnoException)
+  CRU_DELETE_MOVE(ErrnoException)
+
+  ~ErrnoException() override = default;
+
+  int GetErrnoCode() const { return errno_code_; }
+
+ private:
+  int errno_code_;
+};
+}  // namespace cru::platform::unix
+
+#endif
diff --git a/include/cru/common/platform/unix/UnixFileStream.hpp b/include/cru/common/platform/unix/UnixFileStream.hpp
new file mode 100644
index 00000000..618f7aa3
--- /dev/null
+++ b/include/cru/common/platform/unix/UnixFileStream.hpp
@@ -0,0 +1,47 @@
+#pragma once
+
+#include "../../PreConfig.hpp"
+
+#ifdef CRU_PLATFORM_UNIX
+
+#include "../../String.hpp"
+#include "../../io/OpenFileFlag.hpp"
+#include "../../io/Stream.hpp"
+
+namespace cru::platform::unix {
+class UnixFileStream : public io::Stream {
+ public:
+  UnixFileStream(String path, io::OpenFileFlag flags);
+
+  CRU_DELETE_COPY(UnixFileStream)
+  CRU_DELETE_MOVE(UnixFileStream)
+
+  ~UnixFileStream() override;
+
+ public:
+  bool CanSeek() override;
+  Index Tell() override;
+  void Seek(Index offset, SeekOrigin origin = SeekOrigin::Current) override;
+
+  bool CanRead() override;
+  Index Read(std::byte* buffer, Index offset, Index size) override;
+  using Stream::Read;
+
+  bool CanWrite() override;
+  Index Write(const std::byte* buffer, Index offset, Index size) override;
+  using Stream::Write;
+
+  void Close() override;
+
+ private:
+  void CheckClosed();
+
+ private:
+  String path_;
+  io::OpenFileFlag flags_;
+  int file_descriptor_;
+  bool closed_ = false;
+};
+}  // namespace cru::platform::unix
+
+#endif
-- 
cgit v1.2.3