Fix using std::monostate seems broken

arximboldi · Aug 17, 2022 · 279ff67 · 279ff67
1 parent 5da3b90
commit 279ff67
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/ewig/application.cpp b/src/ewig/application.cpp
@@ -45,7 +45,7 @@ struct arg<void>
     template <typename Fn, typename Arg, typename... Args>
     static auto invoke(Fn&& fn, const Arg& arg, Args&&... args)
     {
-        assert(std::holds_alternative<std::monostate>(arg));
+        assert(std::holds_alternative<none_t>(arg));
         return std::forward<Fn>(fn)(std::forward<Args>(args)...);
     }
 };

diff --git a/src/ewig/application.hpp b/src/ewig/application.hpp
@@ -31,7 +31,9 @@
 
 namespace ewig {
 
-using arg_t = std::variant<std::monostate,
+struct none_t {};
+
+using arg_t = std::variant<none_t,
                           std::string,
                           wchar_t>;
 
@@ -81,6 +83,7 @@ application apply_edit(application state, coord size, std::pair<buffer, text> ed
 
 } // namespace ewig
 
+LAGER_STRUCT(ewig, none_t);
 LAGER_STRUCT(ewig, key_action, key);
 LAGER_STRUCT(ewig, resize_action, size);
 LAGER_STRUCT(ewig, command_action, name, arg);