Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2025-02-22 16:39:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor cleanup.

Browse Source
This commit is contained in:
Ralf W. Grosse-Kunstleve 2022-06-21 14:56:34 -07:00
parent d390918d88
commit e515940252
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/pybind11/cast.h
View File

@ -860,7 +860,6 @@ protected:
return result.release(); return result.release();
} }
// TODO: PYBIND11_DETAIL_TYPE_CASTER_ACCESS_TRANSLATION_UNIT_LOCAL...?
Tuple<make_caster<Ts>...> subcasters; Tuple<make_caster<Ts>...> subcasters;
}; };
@ -1370,7 +1369,6 @@ tuple make_tuple() {
template <return_value_policy policy = return_value_policy::automatic_reference, typename... Args> template <return_value_policy policy = return_value_policy::automatic_reference, typename... Args>
tuple make_tuple(Args &&...args_) { tuple make_tuple(Args &&...args_) {
// TODO: PYBIND11_DETAIL_TYPE_CASTER_ACCESS_TRANSLATION_UNIT_LOCAL...?
constexpr size_t size = sizeof...(Args); constexpr size_t size = sizeof...(Args);
std::array<object, size> args{{reinterpret_steal<object>( std::array<object, size> args{{reinterpret_steal<object>(
detail::make_caster<Args>::cast(std::forward<Args>(args_), policy, nullptr))...}}; detail::make_caster<Args>::cast(std::forward<Args>(args_), policy, nullptr))...}};
@ -1601,7 +1599,6 @@ private:
return std::forward<Func>(f)(cast_op<Args>(std::move(std::get<Is>(argcasters)))...); return std::forward<Func>(f)(cast_op<Args>(std::move(std::get<Is>(argcasters)))...);
} }
// TODO: PYBIND11_DETAIL_TYPE_CASTER_ACCESS_TRANSLATION_UNIT_LOCAL...?
std::tuple<make_caster<Args>...> argcasters; std::tuple<make_caster<Args>...> argcasters;
}; };

6
include/pybind11/pybind11.h
View File

@ -214,7 +214,7 @@ protected:
/* Type casters for the function arguments and return value */ /* Type casters for the function arguments and return value */
using cast_in = argument_loader<Args...>; using cast_in = argument_loader<Args...>;
using make_caster_type_out = conditional_t<std::is_void<Return>::value, void_type, Return>; using make_caster_type_out = conditional_t<std::is_void<Return>::value, void_type, Return>;
PYBIND11_DETAIL_TYPE_CASTER_ACCESS_TRANSLATION_UNIT_LOCAL(make_caster_type_out); PYBIND11_DETAIL_TYPE_CASTER_ACCESS_TRANSLATION_UNIT_LOCAL(make_caster_type_out)
using cast_out = make_caster<make_caster_type_out>; using cast_out = make_caster<make_caster_type_out>;
static_assert( static_assert(
@ -1855,7 +1855,7 @@ public:
auto *ptr = new capture{std::forward<Func>(func)}; auto *ptr = new capture{std::forward<Func>(func)};
install_buffer_funcs( install_buffer_funcs(
[](PyObject *obj, void *ptr) -> buffer_info * { [](PyObject *obj, void *ptr) -> buffer_info * {
PYBIND11_DETAIL_TYPE_CASTER_ACCESS_TRANSLATION_UNIT_LOCAL(type); PYBIND11_DETAIL_TYPE_CASTER_ACCESS_TRANSLATION_UNIT_LOCAL(type)
detail::make_caster<type> caster; detail::make_caster<type> caster;
if (!caster.load(obj, false)) { if (!caster.load(obj, false)) {
return nullptr; return nullptr;
@ -2717,7 +2717,7 @@ void implicitly_convertible() {
return nullptr; return nullptr;
} }
set_flag flag_helper(currently_used); set_flag flag_helper(currently_used);
PYBIND11_DETAIL_TYPE_CASTER_ACCESS_TRANSLATION_UNIT_LOCAL(InputType); PYBIND11_DETAIL_TYPE_CASTER_ACCESS_TRANSLATION_UNIT_LOCAL(InputType)
if (!detail::make_caster<InputType>().load(obj, false)) { if (!detail::make_caster<InputType>().load(obj, false)) {
return nullptr; return nullptr;
} }