Tweak error code domains

albin-johansson · Oct 15, 2023 · 135c5e0 · 135c5e0
1 parent 4759c75
commit 135c5e0
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 22 deletions.
diff --git a/modules/core/inc/tactile/core/io/compression/compression_error.hpp b/modules/core/inc/tactile/core/io/compression/compression_error.hpp
@@ -2,8 +2,6 @@
 
 #pragma once
 
-#include <utility>  // to_underlying
-
 #include "tactile/core/api.hpp"
 #include "tactile/core/debug/error_code.hpp"
 #include "tactile/core/functional/expected.hpp"
@@ -22,18 +20,20 @@ class CompressionErrorDomain final : public IErrorDomain {
     kInvalidMode,    ///< An invalid compression mode was used.
   };
 
+  constexpr CompressionErrorDomain() noexcept = default;
+
+  constexpr ~CompressionErrorDomain() noexcept override = default;
+
+  TACTILE_DEFAULT_COPY(CompressionErrorDomain);
+  TACTILE_DEFAULT_MOVE(CompressionErrorDomain);
+
   [[nodiscard]]
   TACTILE_CORE_API auto get_message(uint32 error_id) const noexcept
       -> StringView override;
 };
 
 using CompressionError = CompressionErrorDomain::Error;
 
-/**
- * \brief The global compression error domain.
- */
-inline constexpr CompressionErrorDomain kCompressionErrorDomain;
-
 /**
  * \brief Convenience function for creating a compression error code.
  *
@@ -42,9 +42,6 @@ inline constexpr CompressionErrorDomain kCompressionErrorDomain;
  * \return an error code.
  */
 [[nodiscard]]
-inline auto error(const CompressionError error) noexcept -> Unexpected<ErrorCode>
-{
-  return unexpected(ErrorCode {&kCompressionErrorDomain, std::to_underlying(error)});
-}
+TACTILE_CORE_API auto error(CompressionError error) noexcept -> Unexpected<ErrorCode>;
 
 }  // namespace tactile
diff --git a/modules/core/inc/tactile/core/io/save/save_format_error.hpp b/modules/core/inc/tactile/core/io/save/save_format_error.hpp
@@ -2,8 +2,6 @@
 
 #pragma once
 
-#include <utility>  // to_underlying
-
 #include "tactile/core/api.hpp"
 #include "tactile/core/debug/error_code.hpp"
 #include "tactile/core/functional/expected.hpp"
@@ -31,16 +29,18 @@ class SaveFormatErrorDomain final : public IErrorDomain {
     kBadCompressionMode,       ///< An invalid compression mode was detected.
   };
 
+  constexpr SaveFormatErrorDomain() noexcept = default;
+
+  constexpr ~SaveFormatErrorDomain() noexcept override = default;
+
+  TACTILE_DEFAULT_COPY(SaveFormatErrorDomain);
+  TACTILE_DEFAULT_MOVE(SaveFormatErrorDomain);
+
   [[nodiscard]]
   TACTILE_CORE_API auto get_message(uint32 error_id) const noexcept
       -> StringView override;
 };
 
-/**
- * \brief The global save format error domain.
- */
-inline constexpr SaveFormatErrorDomain kSaveFormatErrorDomain;
-
 using SaveFormatError = SaveFormatErrorDomain::Error;
 
 /**
@@ -51,9 +51,6 @@ using SaveFormatError = SaveFormatErrorDomain::Error;
  * \return an error code.
  */
 [[nodiscard]]
-inline auto error(const SaveFormatError error) noexcept -> Unexpected<ErrorCode>
-{
-  return unexpected(ErrorCode {&kSaveFormatErrorDomain, std::to_underlying(error)});
-}
+TACTILE_CORE_API auto error(SaveFormatError error) noexcept -> Unexpected<ErrorCode>;
 
 }  // namespace tactile
diff --git a/modules/core/src/tactile/core/io/compression/compression_error.cpp b/modules/core/src/tactile/core/io/compression/compression_error.cpp
@@ -2,7 +2,14 @@
 
 #include "tactile/core/io/compression/compression_error.hpp"
 
+#include <utility>  // to_underlying
+
 namespace tactile {
+namespace {
+
+inline constexpr CompressionErrorDomain kCompressionErrorDomain;
+
+}  // namespace
 
 auto CompressionErrorDomain::get_message(const uint32 error_id) const noexcept
     -> StringView
@@ -16,4 +23,9 @@ auto CompressionErrorDomain::get_message(const uint32 error_id) const noexcept
   return "";
 }
 
+auto error(const CompressionError error) noexcept -> Unexpected<ErrorCode>
+{
+  return unexpected(ErrorCode {&kCompressionErrorDomain, std::to_underlying(error)});
+}
+
 }  // namespace tactile
diff --git a/modules/core/src/tactile/core/io/save/save_format_error.cpp b/modules/core/src/tactile/core/io/save/save_format_error.cpp
@@ -2,7 +2,14 @@
 
 #include "tactile/core/io/save/save_format_error.hpp"
 
+#include <utility>  // to_underlying
+
 namespace tactile {
+namespace {
+
+inline constexpr SaveFormatErrorDomain kSaveFormatErrorDomain;
+
+}  // namespace
 
 auto SaveFormatErrorDomain::get_message(const uint32 error_id) const noexcept
     -> StringView
@@ -40,4 +47,9 @@ auto SaveFormatErrorDomain::get_message(const uint32 error_id) const noexcept
   return "";
 }
 
+auto error(const SaveFormatError error) noexcept -> Unexpected<ErrorCode>
+{
+  return unexpected(ErrorCode {&kSaveFormatErrorDomain, std::to_underlying(error)});
+}
+
 }  // namespace tactile