Merge pull request #166 from timpatt/master

MSVC: Fixes
arximboldi · Mar 26, 2024 · 503ea6a · 503ea6a
2 parents 3853bd9 + e0090b3
commit 503ea6a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/lager/config.hpp b/lager/config.hpp
@@ -16,6 +16,10 @@
 #define LAGER_HAS_CPP17 1
 #endif
 
+#if defined(_MSC_VER) && !defined(LAGER_DISABLE_STORE_DEPENDENCY_CHECKS)
+#define LAGER_DISABLE_STORE_DEPENDENCY_CHECKS
+#endif
+
 #ifdef __has_feature
 #if !__has_feature(cxx_exceptions)
 #define LAGER_NO_EXCEPTIONS

diff --git a/lager/store.hpp b/lager/store.hpp
@@ -169,8 +169,9 @@ class store
                                 base_t::send_down();
                                 base_t::notify();
                             }
+                            auto& ctxMsvcWorkaround = ctx;
                             if constexpr (std::is_same_v<void,
-                                                         decltype(eff(ctx))>) {
+                                    decltype(eff(ctxMsvcWorkaround))>) {
                                 eff(ctx);
                                 if constexpr (has_futures)
                                     p();