From 11df846b1ec951dd35feb9b0bad42486c7b94dca Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Thu, 4 Jun 2026 19:42:02 +0200 Subject: magic: refactor construction --- cabinet/magic.hpp | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'cabinet/magic.hpp') diff --git a/cabinet/magic.hpp b/cabinet/magic.hpp index 02af9c2..25cf60b 100644 --- a/cabinet/magic.hpp +++ b/cabinet/magic.hpp @@ -3,6 +3,9 @@ #include +#include +#include +#include #include namespace cab @@ -40,13 +43,23 @@ namespace cab no_simh = MAGIC_NO_CHECK_SIMH, }; - magic(flags flags); + auto static open(flags flags, std::string_view database = {}) noexcept -> std::expected; + ~magic(); + magic(magic const &) = delete; + magic(magic && other) noexcept; + + auto operator=(magic const &) -> magic & = delete; + auto operator=(magic && other) noexcept -> magic &; private: - magic_t m_cookie{}; + explicit magic(::magic_t cookie) noexcept; + + ::magic_t m_cookie{}; }; + auto swap(magic & lhs, magic & rhs) noexcept -> void; + constexpr auto operator|(magic::flags lhs, magic::flags rhs) noexcept -> magic::flags { return static_cast(std::to_underlying(lhs) | std::to_underlying(rhs)); -- cgit v1.2.3