Skip to content

Commit 77b097e

Browse files
committed
fix patch
1 parent 0245385 commit 77b097e

File tree

1 file changed

+4
-19
lines changed

1 file changed

+4
-19
lines changed

examples/sol2/fix_for_clang.patch

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,9 @@
11
Common subdirectories: a/.bcr and b/.bcr
22
Common subdirectories: a/.github and b/.github
3-
diff --git a/sol/sol.hpp b/sol/sol.hpp index 8b0b7d36ea4ef..1a9375d996d2f 100644
4-
--- a/sol/sol.hpp
5-
+++ b/sol/sol.hpp
6-
@@ -19416,7 +19416,13 @@ namespace sol { namespace function_detail {
7-
}
8-
9-
template <bool is_yielding, bool no_trampoline>
10-
- static int call(lua_State* L) noexcept(std::is_nothrow_copy_assignable_v<T>) {
11-
+ static int call(lua_State* L)
12-
+#if SOL_IS_ON(SOL_COMPILER_CLANG)
13-
+ // apparent regression in clang 18 - llvm/llvm-project#91362
14-
+#else
15-
+ noexcept(std::is_nothrow_copy_assignable_v<T>)
16-
+#endif
17-
+ {
18-
int nr;
19-
if constexpr (no_trampoline) {
20-
nr = real_call(L);
21-
@@ -19456,7 +19462,13 @@ namespace sol { namespace function_detail {
3+
diff -u a/include/sol/function_types_stateless.hpp b/include/types/function_types_stateless.hpp
4+
--- a/include/sol/function_types_stateless.hpp
5+
+++ b/include/sol/function_types_stateless.hpp
6+
@@ -322,7 +322,13 @@ namespace sol { namespace function_detail {
227
}
238

249
template <bool is_yielding, bool no_trampoline>

0 commit comments

Comments
 (0)