Update Glaze and build using clang-cl

batterycenter · Jan 18, 2024 · bdf642e · bdf642e
1 parent e045b5b
commit bdf642e
Show file tree

Hide file tree

Showing 60 changed files with 5,744 additions and 1,912 deletions.
diff --git a/src/core/include/battery/application.hpp b/src/core/include/battery/application.hpp
@@ -8,6 +8,7 @@
 #include "eventbus.hpp"
 #include "events.hpp"
 #include "renderer.hpp"
+#include <optional>
 
 extern std::unique_ptr<b::Application> CreateApp();
 

diff --git a/src/core/include/battery/thread.hpp b/src/core/include/battery/thread.hpp
@@ -140,11 +140,11 @@ namespace b {
           : std::jthread([func = std::forward<Fn>(func), ...args = std::forward<Args>(args), this]() mutable {
                 m_waitRunningPromise.set_value();
                 if constexpr (std::is_invocable_v<std::decay_t<Fn>, std::stop_token, std::decay_t<Args>...>) {
-                    if (!catchCommonExceptions(std::move(func), get_stop_token(), std::move(args)...)) {
+                    if (!CatchCommonExceptions(std::move(func), get_stop_token(), std::move(args)...)) {
                         closeApplicationIfExists();
                     }
                 } else {
-                    if (!catchCommonExceptions(std::move(func), std::move(args)...)) {
+                    if (!CatchCommonExceptions(std::move(func), std::move(args)...)) {
                         closeApplicationIfExists();
                     }
                 }

diff --git a/src/core/include/glaze/api/impl.hpp b/src/core/include/glaze/api/impl.hpp
@@ -91,8 +91,9 @@ namespace glz
       }
 
       template <class Arg_tuple, class F, class Parent, size_t... Is>
-         requires std::invocable<F, Parent, ref_t<std::tuple_element_t<Is, Arg_tuple>>...> decltype(auto)
-      call_args(F&& f, Parent&& parent, [[maybe_unused]] std::span<void*> args, std::index_sequence<Is...>)
+         requires std::invocable<F, Parent, ref_t<std::tuple_element_t<Is, Arg_tuple>>...>
+      decltype(auto) call_args(F&& f, Parent&& parent, [[maybe_unused]] std::span<void*> args,
+                               std::index_sequence<Is...>)
       {
          return f(parent, to_ref<std::tuple_element_t<Is, Arg_tuple>>(args[Is])...);
       }
@@ -245,8 +246,8 @@ namespace glz
                            static constexpr auto h = glz::hash<F>();
                            if (h == type_hash) [[likely]] {
                               auto* f = new F{};
-                              *f = [parent = &parent, val = &val](auto&&... args) -> decltype(auto) {
-                                 return ((*parent).*(*val))(std::forward<decltype(args)>(args)...);
+                              *f = [=, parent = &parent](auto&&... args) -> decltype(auto) {
+                                 return ((*parent).*(val))(std::forward<decltype(args)>(args)...);
                               };
                               result = std::unique_ptr<void, void (*)(void*)>{
                                  f, [](void* ptr) { delete static_cast<F*>(ptr); }};

diff --git a/src/core/include/glaze/api/lib.hpp b/src/core/include/glaze/api/lib.hpp
@@ -29,7 +29,7 @@
 #include <dlfcn.h>
 #define SHARED_LIBRARY_EXTENSION ".dylib"
 #define SHARED_LIBRARY_PREFIX "lib"
-#elif __linux__
+#elif __has_include(<dlfcn.h>)
 #include <dlfcn.h>
 #define SHARED_LIBRARY_EXTENSION ".so"
 #define SHARED_LIBRARY_PREFIX "lib"