Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch to pybind11 to avoid issue with concat #144

Merged
merged 1 commit into from
Nov 28, 2023
Merged

Patch to pybind11 to avoid issue with concat #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions resources/include_pybind11.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ else()
pybind11
GIT_REPOSITORY https://github.com/pybind/pybind11
GIT_TAG "v${PYBIND_VERSION}"
PATCH_COMMAND git apply ${CMAKE_CURRENT_SOURCE_DIR}/resources/pybind11_${PYBIND_VERSION}.patch || git apply ${CMAKE_CURRENT_SOURCE_DIR}/resources/pybind11_${PYBIND_VERSION}.patch --reverse --check
)

FetchContent_MakeAvailable(pybind11)
Expand Down
22 changes: 22 additions & 0 deletions resources/pybind11_2.10.0.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
diff --git a/include/pybind11/cast.h b/include/pybind11/cast.h
index a0e32281..f132d096 100644
--- a/include/pybind11/cast.h
+++ b/include/pybind11/cast.h
@@ -657,7 +657,7 @@ public:
}

static constexpr auto name
- = const_name("Tuple[") + concat(make_caster<Ts>::name...) + const_name("]");
+ = const_name("Tuple[") + pybind11::detail::concat(make_caster<Ts>::name...) + const_name("]");

template <typename T>
using cast_op_type = type;
@@ -1399,7 +1399,7 @@ public:
static_assert(args_pos == -1 || args_pos == constexpr_first<argument_is_args, Args...>(),
"py::args cannot be specified more than once");

- static constexpr auto arg_names = concat(type_descr(make_caster<Args>::name)...);
+ static constexpr auto arg_names = pybind11::detail::concat(type_descr(make_caster<Args>::name)...);

bool load_args(function_call &call) { return load_impl_sequence(call, indices{}); }

22 changes: 22 additions & 0 deletions resources/pybind11_2.11.1.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
diff --git a/include/pybind11/cast.h b/include/pybind11/cast.h
index db393411..117680a1 100644
--- a/include/pybind11/cast.h
+++ b/include/pybind11/cast.h
@@ -661,7 +661,7 @@ public:
}

static constexpr auto name
- = const_name("Tuple[") + concat(make_caster<Ts>::name...) + const_name("]");
+ = const_name("Tuple[") + pybind11::detail::concat(make_caster<Ts>::name...) + const_name("]");

template <typename T>
using cast_op_type = type;
@@ -1438,7 +1438,7 @@ public:
static_assert(args_pos == -1 || args_pos == constexpr_first<argument_is_args, Args...>(),
"py::args cannot be specified more than once");

- static constexpr auto arg_names = concat(type_descr(make_caster<Args>::name)...);
+ static constexpr auto arg_names = pybind11::detail::concat(type_descr(make_caster<Args>::name)...);

bool load_args(function_call &call) { return load_impl_sequence(call, indices{}); }

Loading