aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/cru/base/Exception.h7
-rw-r--r--include/cru/base/platform/Exception.h12
-rw-r--r--include/cru/platform/Exception.h1
-rw-r--r--src/base/CMakeLists.txt1
-rw-r--r--src/base/platform/Exception.cpp1
5 files changed, 7 insertions, 15 deletions
diff --git a/include/cru/base/Exception.h b/include/cru/base/Exception.h
index 609fd2c9..b299acc4 100644
--- a/include/cru/base/Exception.h
+++ b/include/cru/base/Exception.h
@@ -34,6 +34,13 @@ class CRU_BASE_API Exception : public std::exception {
std::unique_ptr<std::exception> inner_;
};
+class CRU_BASE_API PlatformException : public Exception {
+ public:
+ using Exception::Exception; // inherit constructors
+
+ CRU_DEFAULT_DESTRUCTOR(PlatformException)
+};
+
class CRU_BASE_API TextEncodeException : public Exception {
public:
using Exception::Exception;
diff --git a/include/cru/base/platform/Exception.h b/include/cru/base/platform/Exception.h
deleted file mode 100644
index 74dd6ad4..00000000
--- a/include/cru/base/platform/Exception.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once
-#include "../Base.h"
-#include "../Exception.h"
-
-namespace cru::platform {
-class CRU_BASE_API PlatformException : public Exception {
- public:
- using Exception::Exception; // inherit constructors
-
- CRU_DEFAULT_DESTRUCTOR(PlatformException)
-};
-} // namespace cru::platform
diff --git a/include/cru/platform/Exception.h b/include/cru/platform/Exception.h
index 2771d4d7..4f9dc9ce 100644
--- a/include/cru/platform/Exception.h
+++ b/include/cru/platform/Exception.h
@@ -2,7 +2,6 @@
#include "Base.h"
#include "cru/base/Base.h"
#include "cru/base/Exception.h"
-#include "cru/base/platform/Exception.h"
#include <optional>
diff --git a/src/base/CMakeLists.txt b/src/base/CMakeLists.txt
index 00f35772..6f33441d 100644
--- a/src/base/CMakeLists.txt
+++ b/src/base/CMakeLists.txt
@@ -17,7 +17,6 @@ add_library(CruBase
io/MemoryStream.cpp
log/Logger.cpp
log/StdioLogTarget.cpp
- platform/Exception.cpp
)
target_compile_definitions(CruBase PRIVATE CRU_BASE_EXPORT_API)
target_include_directories(CruBase PUBLIC ${CRU_INCLUDE_DIR})
diff --git a/src/base/platform/Exception.cpp b/src/base/platform/Exception.cpp
deleted file mode 100644
index b5e8c5b9..00000000
--- a/src/base/platform/Exception.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "cru/base/platform/Exception.h"