diff --git a/src/thirdparty/axom/sol.hpp b/src/thirdparty/axom/sol.hpp index 243ed4cf74..df11c0b92d 100644 --- a/src/thirdparty/axom/sol.hpp +++ b/src/thirdparty/axom/sol.hpp @@ -14425,7 +14425,7 @@ namespace sol { // constexpr is fine for not-clang namespace detail { - template (Args...)>> + template , Args...>> inline constexpr auto resolve_i(types, F &&) -> R (meta::unqualified_t::*)(Args...) { using Sig = R(Args...); typedef meta::unqualified_t Fu; @@ -14449,7 +14449,7 @@ namespace sol { return resolve_f(meta::has_deducible_signature{}, std::forward(f)); } - template > + template > inline constexpr auto resolve_i(types, F&& f) -> decltype(resolve_i(types(), std::forward(f))) { return resolve_i(types(), std::forward(f)); } @@ -14495,7 +14495,7 @@ namespace sol { // so don't use the constexpr versions inside of clang. namespace detail { - template (Args...)>> + template , Args...>> inline auto resolve_i(types, F &&) -> R (meta::unqualified_t::*)(Args...) { using Sig = R(Args...); typedef meta::unqualified_t Fu; @@ -14519,7 +14519,7 @@ namespace sol { return resolve_f(meta::has_deducible_signature{}, std::forward(f)); } - template > + template > inline auto resolve_i(types, F&& f) -> decltype(resolve_i(types(), std::forward(f))) { return resolve_i(types(), std::forward(f)); } @@ -20652,7 +20652,7 @@ namespace sol { } private: - template > + template > void set_fx(types, Key&& key, Fx&& fx) { set_resolved_function(std::forward(key), std::forward(fx)); } diff --git a/src/thirdparty/axom/sol_invoke_result.patch b/src/thirdparty/axom/sol_invoke_result.patch new file mode 100644 index 0000000000..bc296bfaaa --- /dev/null +++ b/src/thirdparty/axom/sol_invoke_result.patch @@ -0,0 +1,49 @@ +diff --git a/src/thirdparty/axom/sol.hpp b/src/thirdparty/axom/sol.hpp +index 243ed4cf7..df11c0b92 100644 +--- a/src/thirdparty/axom/sol.hpp ++++ b/src/thirdparty/axom/sol.hpp +@@ -14425,7 +14425,7 @@ namespace sol { + // constexpr is fine for not-clang + + namespace detail { +- template (Args...)>> ++ template , Args...>> + inline constexpr auto resolve_i(types, F &&) -> R (meta::unqualified_t::*)(Args...) { + using Sig = R(Args...); + typedef meta::unqualified_t Fu; +@@ -14449,7 +14449,7 @@ namespace sol { + return resolve_f(meta::has_deducible_signature{}, std::forward(f)); + } + +- template > ++ template > + inline constexpr auto resolve_i(types, F&& f) -> decltype(resolve_i(types(), std::forward(f))) { + return resolve_i(types(), std::forward(f)); + } +@@ -14495,7 +14495,7 @@ namespace sol { + // so don't use the constexpr versions inside of clang. + + namespace detail { +- template (Args...)>> ++ template , Args...>> + inline auto resolve_i(types, F &&) -> R (meta::unqualified_t::*)(Args...) { + using Sig = R(Args...); + typedef meta::unqualified_t Fu; +@@ -14519,7 +14519,7 @@ namespace sol { + return resolve_f(meta::has_deducible_signature{}, std::forward(f)); + } + +- template > ++ template > + inline auto resolve_i(types, F&& f) -> decltype(resolve_i(types(), std::forward(f))) { + return resolve_i(types(), std::forward(f)); + } +@@ -20652,7 +20652,7 @@ namespace sol { + } + + private: +- template > ++ template > + void set_fx(types, Key&& key, Fx&& fx) { + set_resolved_function(std::forward(key), std::forward(fx)); + }