...

7 files changed, 30 insertions, 28 deletions

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/ErrnoException.hpp b/include/cru/common/platform/unix/ErrnoException.hpp
index d1390cf2..2982e26a 100644
--- a/include/cru/common/ErrnoException.hpp
+++ b/include/cru/common/platform/unix/ErrnoException.hpp
@@ -1,13 +1,13 @@
 #pragma once
 
-#include "PreConfig.hpp"
+#include "../../PreConfig.hpp"
 
 #ifdef CRU_PLATFORM_UNIX
 
-#include "Exception.hpp"
+#include "../Exception.hpp"
 
-namespace cru {
-class ErrnoException : public Exception {
+namespace cru::platform::unix {
+class ErrnoException : public PlatformException {
  public:
   ErrnoException() : ErrnoException(String{}) {}
   explicit ErrnoException(const String& message);
@@ -23,6 +23,6 @@ class ErrnoException : public Exception {
  private:
   int errno_code_;
 };
-}  // namespace cru
+}  // namespace cru::platform::unix
 
 #endif
diff --git a/include/cru/common/io/UnixFileStream.hpp b/include/cru/common/platform/unix/UnixFileStream.hpp
index 633b9bd1..618f7aa3 100644
--- a/include/cru/common/io/UnixFileStream.hpp
+++ b/include/cru/common/platform/unix/UnixFileStream.hpp
@@ -1,17 +1,17 @@
 #pragma once
 
-#include "../PreConfig.hpp"
+#include "../../PreConfig.hpp"
 
 #ifdef CRU_PLATFORM_UNIX
 
-#include "../String.hpp"
-#include "OpenFileFlag.hpp"
-#include "Stream.hpp"
+#include "../../String.hpp"
+#include "../../io/OpenFileFlag.hpp"
+#include "../../io/Stream.hpp"
 
-namespace cru::io {
-class UnixFileStream : public Stream {
+namespace cru::platform::unix {
+class UnixFileStream : public io::Stream {
  public:
-  UnixFileStream(String path, OpenFileFlag flags);
+  UnixFileStream(String path, io::OpenFileFlag flags);
 
   CRU_DELETE_COPY(UnixFileStream)
   CRU_DELETE_MOVE(UnixFileStream)
@@ -38,10 +38,10 @@ class UnixFileStream : public Stream {
 
  private:
   String path_;
-  OpenFileFlag flags_;
+  io::OpenFileFlag flags_;
   int file_descriptor_;
   bool closed_ = false;
 };
-}  // namespace cru::io
+}  // namespace cru::platform::unix
 
 #endif
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 481205a0..200ea7fa 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -17,8 +17,8 @@ target_compile_definitions(cru_base PUBLIC $<$<CONFIG:Debug>:CRU_DEBUG>)
 
 if (UNIX)
 	target_sources(cru_base PRIVATE
-		ErrnoException.cpp
-		io/UnixFileStream.cpp
+		platform/unix/ErrnoException.cpp
+		platform/unix/UnixFileStream.cpp
 	)
 endif()
 
diff --git a/src/common/ErrnoException.cpp b/src/common/platform/unix/ErrnoException.cpp
index 731ae3e5..14e6a5a2 100644
--- a/src/common/ErrnoException.cpp
+++ b/src/common/platform/unix/ErrnoException.cpp
@@ -1,14 +1,14 @@
-#include "cru/common/ErrnoException.hpp"
+#include "cru/common/platform/unix/ErrnoException.hpp"
 
 #include "cru/common/Format.hpp"
 
 #include <errno.h>
 
-namespace cru {
+namespace cru::platform::unix {
 ErrnoException::ErrnoException(const String& message)
     : ErrnoException(message, errno) {}
 
 ErrnoException::ErrnoException(const String& message, int errno_code)
-    : Exception(Format(u"{}. Errno is {}.", message, errno_code)),
+    : PlatformException(Format(u"{}. Errno is {}.", message, errno_code)),
       errno_code_(errno_code) {}
-}  // namespace cru
+}  // namespace cru::platform::unix
diff --git a/src/common/io/UnixFileStream.cpp b/src/common/platform/unix/UnixFileStream.cpp
index 615c36f1..bb8d4207 100644
--- a/src/common/io/UnixFileStream.cpp
+++ b/src/common/platform/unix/UnixFileStream.cpp
@@ -1,13 +1,14 @@
-#include "cru/common/io/UnixFileStream.hpp"
-#include "cru/common/ErrnoException.hpp"
-#include "cru/common/io/OpenFileFlag.hpp"
+#include "cru/common/platform/unix/UnixFileStream.hpp"
 #include "cru/common/Format.hpp"
+#include "cru/common/io/OpenFileFlag.hpp"
+#include "cru/common/platform/unix/ErrnoException.hpp"
 
 #include <fcntl.h>
 #include <sys/_types/_s_ifmt.h>
 #include <unistd.h>
 
-namespace cru::io {
+namespace cru::platform::unix {
+using namespace cru::io;
 
 namespace {
 int MapOpenFileFlag(OpenFileFlag flags) {
@@ -131,4 +132,4 @@ void UnixFileStream::CheckClosed() {
     throw Exception(u"File is closed.");
   }
 }
-}  // namespace cru::io
+}  // namespace cru::platform::unix
diff --git a/test/common/io/UnixFileStreamTest.cpp b/test/common/io/UnixFileStreamTest.cpp
index 1b73dd3b..cdc749ba 100644
--- a/test/common/io/UnixFileStreamTest.cpp
+++ b/test/common/io/UnixFileStreamTest.cpp
@@ -1,5 +1,5 @@
 #include "cru/common/io/OpenFileFlag.hpp"
-#include "cru/common/io/UnixFileStream.hpp"
+#include "cru/common/platform/unix/UnixFileStream.hpp"
 
 #include <gtest/gtest.h>
 
@@ -9,6 +9,7 @@
 TEST(UnixFileStream, Work) {
   using namespace cru;
   using namespace cru::io;
+  using namespace cru::platform::unix;
 
   auto temp_file_path =
       (std::filesystem::temp_directory_path() / "cru_test_temp.XXXXXX")